Commit Graph
13 Commits
Author SHA1 Message Date
RoxyandGitHub 62c08cd213 Fix broken default_deconstruction_screwdriver calls (#5673)
## About The Pull Request

The proc no longer takes icon state arguments so these calls are all
broken now

## Why It's Good For The Game

Makes a bunch of stuff not runtime when you try to open the panel on it

## Proof Of Testing

I spawned in every object changed and tested screwdrivering the panel
open and closed

## Changelog
🆑
fix: fixed screwdrivering certain machines not working
/🆑
2026-05-28 13:46:58 -04:00
nevimer baf3837ae8 Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29
# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx
2025-11-29 22:49:21 -05:00
Bobbanz1andGitHub eea0bf0a04 [PORT] Fixes Assistants can punch their own punch cards with their PDAs (#4642)
## About The Pull Request
This PR pulls a PR from downstream to upstream in order to allow for
proper merge on downstream without issues.
* https://github.com/SPLURT-Station/S.P.L.U.R.T-tg/pull/562

To quote that PR:
Long story short
Assistants could punch their punch cards by turning it in and then using
their PDA on the newly created one, thus earning around 900 credits
within 10 mins.

This PR fixes that problem.
## Why It's Good For The Game
Fixes an oversight that was made by the person coding this thing.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


https://github.com/user-attachments/assets/fc969ad8-b94d-4196-b1d1-4a4ce1a7d69b

</details>

## Changelog
🆑
fix: Fixes an oversight made by a previous coder who created the punch
card PDA system.
/🆑
2025-09-09 07:15:36 -06:00
nevimer db5aa35b59 Fix build issues related to upstream pull 2025-09-03 20:27:07 -04:00
nevimer 368543b6fd GallowsCalibrator and Waterpig's fixes, but squash 2025-03-16 01:55:41 -04:00
RoxyandGitHub 5020cec410 Fix define sanity linter failures (#3209)
Fix all of the define sanity failures, either by adding an `#undef`
where needed or moving them to a file in `code/__DEFINES`

![image](https://github.com/user-attachments/assets/abd76dcd-d610-4567-801e-ee7fc477d58c)
2025-03-06 03:24:59 -05:00
Rimi NoshaandGitHub ff028fadc0 Make PDAs Able to Punch GAP Cards, Buff Payout to 150cr (#2465)
## About The Pull Request

Tin, doesn't remove the puncher from code because I don't feel like
removing it from maps (if it exists), also gives the option for bussing
I suppose.

Requires head access to puch GAP cards. Not much else to comment on,
really.

## Why It's Good For The Game

GAP cards are almost never used, and heads ditch the stamp like it's
hot. Let's just clear up some of the head clutter and instead make it
PDA bound.

Also let's make it worth 150cr, cause 100cr seems a little cheap. This
makes the max possible payout now 900 instead of 600.

## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>



https://github.com/user-attachments/assets/6f67b09e-6706-4e40-9720-868fedf73b06


</details>

## Changelog
🆑
add: Added new mechanics or gameplay changes
add: Added more things
del: Heads no longer start with GAP punchers.
qol: Heads (anyone with command access) can now use their PDA to stamp
GAP cards.
balance: Good Assistant Point cards now pay out 150cr per stamp.
/🆑
2024-11-18 19:30:49 +00:00
StrangeWeirdKitten 25289b8bc6 fixes a fuck load of sounds 2024-10-24 07:52:55 -06:00
b15b16976a [MIRROR] Attack chain refactoring: Broadening tool_act into item_interact, moving some item interactions to... atom/item_interact / item/interact_with_atom [MDB IGNORE] (#25516)
* Attack chain refactoring: Broadening `tool_act` into `item_interact`, moving some item interactions to... `atom/item_interact` / `item/interact_with_atom`

* Patches up merge skew (#80197)

## About The Pull Request

Yeah #79968 (1e76fd70b4) was not
compatible with master but no one said anything on the PR so i got
jebaited into merging it. The code should be up to the same standards
per the documentation I read (preventing thwacking the target in certain
situations while not returning anything in other situations)

master will definitely compile now though

* Patches up merge skew

* Merge conflicts

* Modular adjustments

* Removes this entirely duplicated proc...

* Update tool_override.dm

* Update weldingtool.dm

* Update tool_override.dm

* Update tool_override.dm

* Nope. Copy paste begone.

A skyrat edit is so much easier to deal with here

* Update brand_intelligence.dm

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2023-12-09 08:22:19 -05:00
lessthanthreeandGitHub fc847a47e5 Validate partial GAP punches before paying out (#25435)
validate punches before paying out
2023-12-04 21:27:12 -05:00
lessthanthreeandGitHub 1f47ff3470 Puts a cooldown on the GAP card redemption (#24605)
* Update gbp_punchcard.dm

* Update gbp_punchcard.dm

* Update gbp_punchcard.dm
2023-10-26 16:30:56 -07:00
3a9474ef79 [MODULAR] Good Assistant Points: Help the station, get credits and chicken nuggets! (#24576)
* [MODULAR] Good Assistant Points: Help the station, get credits and chicken nuggets!

* MAKES SHIT MOSTLY MODULAR

* lol whoops

* assistant payment adjustments

* assistants are paid in full for doing jack shit fuck all again, reduces starting punches to 1

* sprites

* ups it to 100 credits a punch

* Update modular_skyrat/modules/automapper/code/area_spawn_entries.dm

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>

* changes

* whoops

* h

* Update gbp_punchcard.dm

* Update gbp_punchcard.dm

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-10-25 22:34:42 -07:00
9a053cfc2b [MODULAR] IRCD removal, Improved RCD added, also featuring, the AFAD (#15105)
* Update packs.dm

* Create AFAD.dm

* forgot not to capitalize

* Create improvedRCD

* Update improvedRCD

* Update improvedRCD

* hit enter to early

* forgot this before testing

* Update goodies.dm

* Update tgstation.dme

* Update improvedRCD.dm

* Update AFAD.dm

* price re-adjustment, IRCD value pack

* Update modular_skyrat/modules/cargo/code/goodies.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update improvedRCD.dm

* Update AFAD.dm

* Update modular_skyrat/modules/cargo/code/goodies.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* Update modular_skyrat/modules/cargo/code/goodies.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* Update goodies.dm

* Update goodies.dm

* Update AFAD.dm

* Update goodies.dm

* Apply suggestions from code review

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update AFAD.dm

* more-cheaply

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-03 01:35:17 +01:00