Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ports stripping menu from TG #5914

Merged
merged 42 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
25f0201
Merge remote-tracking branch 'cmss13-devs/master'
ihatethisengine Feb 22, 2024
bee6fb8
Merge branch 'master' of https://github.com/ihatethisengine/cmss13
ihatethisengine Mar 6, 2024
c712a3c
some attempts
ihatethisengine Mar 7, 2024
41eab20
1
ihatethisengine Mar 7, 2024
0c7a0b2
some progress
ihatethisengine Mar 8, 2024
aedf51a
almost there
ihatethisengine Mar 9, 2024
467bd94
fff
ihatethisengine Mar 10, 2024
3c568f9
final?
ihatethisengine Mar 10, 2024
7eded77
rip
ihatethisengine Mar 10, 2024
046f471
fix
ihatethisengine Mar 10, 2024
52af408
tgui
ihatethisengine Mar 10, 2024
951ee11
some cleanup
ihatethisengine Mar 10, 2024
0683be6
split and type
ihatethisengine Mar 12, 2024
1dd3eb6
Merge branch 'master' into strip_menu_attempt
ihatethisengine Mar 19, 2024
52b6f33
fix
ihatethisengine Mar 26, 2024
0d5eea3
Update code/datums/elements/strippable.dm
Drulikar Mar 26, 2024
ab0e8f7
no xeno stripping
ihatethisengine Mar 26, 2024
538fe18
Merge branch 'strip_menu_attempt' of https://github.com/ihatethisengi…
ihatethisengine Mar 26, 2024
4bdaa26
ignore time_to_equip i guess
ihatethisengine Mar 26, 2024
d1e2cf5
splints can be removed without armor
ihatethisengine Mar 28, 2024
ac0caeb
quick fix
ihatethisengine Mar 30, 2024
3c94bac
Merge branch 'master' into strip_menu_attempt
ihatethisengine Apr 6, 2024
2bfe1fe
Apply suggestions from code review
ihatethisengine Apr 6, 2024
714369f
cant strip NODROP items, use CANTSTRIP if you want items to be unstri…
ihatethisengine Apr 8, 2024
edf2492
can strip NODROP items, use CANTSTRIP if you want items to be unstrip…
ihatethisengine Apr 8, 2024
67bd5d8
Merge branch 'strip_menu_attempt' of https://github.com/ihatethisengi…
ihatethisengine Apr 8, 2024
761ff59
fix
ihatethisengine Apr 9, 2024
5737bc0
forcedrop
ihatethisengine Apr 9, 2024
2be940b
Apply suggestions from code review
ihatethisengine Apr 9, 2024
25cba9c
list
ihatethisengine Apr 9, 2024
e0a422a
styles
ihatethisengine Apr 13, 2024
6dc18cf
:sob:
ihatethisengine Apr 13, 2024
3ae6237
stripcontent
ihatethisengine Apr 13, 2024
63605dd
ssss
ihatethisengine Apr 13, 2024
e71c096
null
ihatethisengine Apr 13, 2024
f257311
no null?
ihatethisengine Apr 13, 2024
e6e8aba
linter mad
ihatethisengine Apr 13, 2024
0d832ed
i am mad
ihatethisengine Apr 13, 2024
43e08aa
rrrrrrrrrrrrrrrrrrrrrrrr
ihatethisengine Apr 13, 2024
47b0069
aaaaaaaaaaaaaaaaa
ihatethisengine Apr 13, 2024
0d150da
ignore hand content on stripping
ihatethisengine Apr 13, 2024
cf954c3
need hand after all...
ihatethisengine Apr 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/equipment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
#define ANIMATED_SURGICAL_TOOL (1<<12)
/// Has heat source but isn't 'on fire' and thus can be stored
#define IGNITING_ITEM (1<<13)
/// Overrides NODROP in some cases (stripping)
#define FORCEDROP_CONDITIONAL (1<<14)
//==========================================================================================


Expand Down
30 changes: 30 additions & 0 deletions code/__DEFINES/strippable.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// All of these must be matched in StripMenu.js.
#define STRIPPABLE_ITEM_HEAD "head"
#define STRIPPABLE_ITEM_BACK "back"
#define STRIPPABLE_ITEM_MASK "wear_mask"
#define STRIPPABLE_ITEM_EYES "glasses"
#define STRIPPABLE_ITEM_L_EAR "wear_l_ear"
#define STRIPPABLE_ITEM_R_EAR "wear_r_ear"
#define STRIPPABLE_ITEM_JUMPSUIT "w_uniform"
#define STRIPPABLE_ITEM_SUIT "wear_suit"
#define STRIPPABLE_ITEM_GLOVES "gloves"
#define STRIPPABLE_ITEM_FEET "shoes"
#define STRIPPABLE_ITEM_SUIT_STORAGE "j_store"
#define STRIPPABLE_ITEM_ID "id"
#define STRIPPABLE_ITEM_BELT "belt"
#define STRIPPABLE_ITEM_LPOCKET "l_store"
#define STRIPPABLE_ITEM_RPOCKET "r_store"
#define STRIPPABLE_ITEM_LHAND "l_hand"
#define STRIPPABLE_ITEM_RHAND "r_hand"
#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"


/// This slot is not obscured.
#define STRIPPABLE_OBSCURING_NONE 0

/// This slot is completely obscured, and cannot be accessed.
#define STRIPPABLE_OBSCURING_COMPLETELY 1

/// This slot can't be seen, but can be accessed.
#define STRIPPABLE_OBSCURING_HIDDEN 2
1 change: 1 addition & 0 deletions code/__HELPERS/_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,4 @@

for(var/i in 1 to inserted_list.len - 1)
inserted_list.Swap(i, rand(i, inserted_list.len))

5 changes: 5 additions & 0 deletions code/_macros.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
#define LAZYREMOVEASSOC(L, K, V) if(L) { if(L[K]) { L[K] -= V; if(!length(L[K])) L -= K; } if(!length(L)) L = null; }
///Accesses an associative list, returns null if nothing is found
#define LAZYACCESSASSOC(L, I, K) L ? L[I] ? L[I][K] ? L[I][K] : null : null : null
///Performs an insertion on the given lazy list with the given key and value. If the value already exists, a new one will not be made.
#define LAZYORASSOCLIST(lazy_list, key, value) \
LAZYINITLIST(lazy_list); \
LAZYINITLIST(lazy_list[key]); \
lazy_list[key] |= value;

// Insert an object A into a sorted list using cmp_proc (/code/_helpers/cmp.dm) for comparison.
#define ADD_SORTED(list, A, cmp_proc) if(!list.len) {list.Add(A)} else {list.Insert(FindElementIndex(A, list, cmp_proc), A)}
Expand Down
1 change: 0 additions & 1 deletion code/_onclick/click_hold.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@

/client/MouseDrop(datum/src_object, datum/over_object, src_location, over_location, src_control, over_control, params)
. = ..()

if(over_object)
SEND_SIGNAL(over_object, COMSIG_ATOM_DROPPED_ON, src_object, src)

Expand Down
1 change: 1 addition & 0 deletions code/_onclick/drag_drop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
/atom/MouseDrop(atom/over)
if(!usr || !over) return

if(!Adjacent(usr) || !over.Adjacent(usr)) return // should stop you from dragging through windows

spawn(0)
Expand Down
Loading
Loading