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.

Sign up for GitHub

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

Jump to bottom

Space Miami 3: Wrong Uplink #68

Closed
wants to merge 9 commits into from
Closed

Space Miami 3: Wrong Uplink #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b389448
do
RosSample Dec 25, 2023
986df1a
icons
RosSample Dec 28, 2023
8f65a05
final?
RosSample Dec 29, 2023
6a959a3
sprite fix
RosSample Dec 29, 2023
3938585
ueeeeee
RosSample Dec 29, 2023
f8c85e5
you like hurting boys don't you?
RosSample Dec 29, 2023
f136f57
Merge branch 'master' into miami
homexp13 Dec 29, 2023
2ce2001
ooh im killing myself
RosSample Dec 29, 2023
275d954
brainrot
RosSample Dec 29, 2023
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/~massmeta_defines/_defines_include.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
#include "inventory.dm"
#include "dcs\signals\signals_mob\signals_mob_carbon.dm"
#include "dcs\signals\signals_mob\signals_mob_living.dm"
2 changes: 2 additions & 0 deletions code/__DEFINES/~massmeta_defines/dcs/signals/signals_mob/signals_mob_carbon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
///Just like mob throw but applies to carbons and carries the information about what you just threw
#define COMSIG_CARBON_THROW "carbon_throw"
8 changes: 8 additions & 0 deletions code/__DEFINES/~massmeta_defines/dcs/signals/signals_mob/signals_mob_living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#define COMSIG_MIAMI_CURED_DISORDER "miami_cured"
#define COMSIG_MIAMI_START_SPREE "miami_start_spree"
#define COMSIG_MIAMI_END_SPREE "miami_end_spree"

///from somewhere in door i dunno use the fucking search function
#define COMSIG_LIVING_INTERACTED_WITH_DOOR "living_interacted_with_door"
#define DOOR_CLOSE "close"
#define DOOR_OPEN "open"
3 changes: 3 additions & 0 deletions code/game/machinery/doors/door.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@
if(!density || (I.w_class < WEIGHT_CLASS_NORMAL && !LAZYLEN(I.GetAccess())))
return
if(check_access(I))
SEND_SIGNAL(AM, COMSIG_LIVING_INTERACTED_WITH_DOOR, src, DOOR_OPEN) // MASSMETA EDIT
open()
else
do_animate("deny")
Expand Down Expand Up @@ -295,8 +296,10 @@
return
if(access_bypass || (requiresID() && allowed(user)))
if(density)
SEND_SIGNAL(user, COMSIG_LIVING_INTERACTED_WITH_DOOR, src, DOOR_OPEN) // MASSMETA EDIT
open()
else
SEND_SIGNAL(user, COMSIG_LIVING_INTERACTED_WITH_DOOR, src, DOOR_OPEN) // MASSMETA EDIT
close()
return TRUE
if(density)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/carbon.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
log_message("has thrown [thrown_thing] [power_throw > 0 ? "really hard" : ""]", LOG_ATTACK)
var/extra_throw_range = HAS_TRAIT(src, TRAIT_THROWINGARM) ? 2 : 0
newtonian_move(get_dir(target, src))
SEND_SIGNAL(src, COMSIG_CARBON_THROW, target, thrown_thing) // MASSMETA EDIT
thrown_thing.safe_throw_at(target, thrown_thing.throw_range + extra_throw_range, max(1,thrown_thing.throw_speed + power_throw), src, null, null, null, move_force)

/mob/living/carbon/proc/canBeHandcuffed()
Expand Down
18 changes: 18 additions & 0 deletions massmeta/code/modules/vending/clothesmate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/obj/machinery/vending/clothing
contraband = list(
/obj/item/clothing/under/syndicate/tacticool = 1,
/obj/item/clothing/under/syndicate/tacticool/skirt = 1,
/obj/item/clothing/mask/balaclava = 1,
/obj/item/clothing/head/costume/ushanka = 1,
/obj/item/clothing/under/costume/soviet = 1,
/obj/item/storage/belt/fannypack/black = 2,
/obj/item/clothing/suit/jacket/letterman_syndie = 1,
/obj/item/clothing/suit/jacket/letterman_syndie = 3,
/obj/item/clothing/mask/gas/miami_classic = 1,
/obj/item/clothing/mask/gas/miami_predator = 1,
/obj/item/clothing/mask/gas/miami_butcher = 1,
/obj/item/clothing/under/costume/jabroni = 1,
/obj/item/clothing/under/costume/geisha = 1,
/obj/item/clothing/under/rank/centcom/officer/replica = 1,
/obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1,
)
Loading
Loading