Commit Graph
101 Commits
Author SHA1 Message Date
e1303fe0ba Make the nuclear beer keg react to the NAD. (#24637)
* Make the nuclear beer keg react to the NAD.

* Made the beer keg nuke attackable again.

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Switched to addtimer per review suggestion.

* Update code/modules/reagents/reagent_dispenser.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-03-26 10:55:28 +00:00
db578cdc6f Makes food not a subtype of reagent holders (#23379)
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 19:00:02 +00:00
GDNandGitHub c23fb7c910 Reverts Slowdown on pulling #21056 (#21596) 2023-09-13 11:40:53 +01:00
DGamerLandGitHub 49ccd5b93c Fixes a weird pixel offset and typo on the beer nuke (#21794)
* okay this should work

* the not map change

* how the fuck did this get in here
2023-07-23 20:02:41 +01:00
fcbd8174e6 Slowdown on pulling (#21056)
* slowdown on pulling

* slowdown only when pulling structure or machinery

* moving speed modifier to /mob/living/carbon instead of all atoms

* added pull_speed to /atom/movable, moved movement_delay proc to carbon/human

* no-slowdown-trash-bin

* Update code/game/atoms_movable.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* removed pull_speed on /obj/item/storage/bag/trash, no need to set this

* more 0 pull_speed objects

* added gravity check, moved pull_speed to /obj

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-07 20:08:25 +01:00
JimKil3andGitHub 7b7a005232 makes the tweak (#21195) 2023-06-05 12:04:33 +01:00
ContrabangandGitHub 282f1cb62c Nuke resprite revival (#20888)
* nuclear revive

* stage fixes

* allows for the core to show while panel is closed

* adds blob nuke

* oops merge failure

* sirryan review

* grammar fix in comment
2023-05-02 21:28:42 +02:00
GDNandGitHub 1f1166c222 most reagent dispensers are no longer automatically anchored (#20613)
* most reagent dispensers are no longer automatically anchored

* water cooler is now anchored

* ryan's request
2023-03-26 12:05:18 +01:00
SteelSlayerandGitHub e49b016df4 Updates the proximity monitor component (#15836)
* prox component update

* mochi review

* bug fix, makes proximity sensors always active

* GC fixes and removes an unused proc

* Disposal fixes from TM

* fixes runtimes when objects created in nullspace runtimes, fixes portable flasher

* a fresh perspective

* lewcc review

* adds comment about direct loc setting over forceMove
2022-04-30 15:50:36 +01:00
joep van der velden 39a280effd Shooting fuel tanks now is logged properly
objects that get qdeleted are only hit once by bullets
2021-11-10 10:23:47 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
joep van der velden 7ed779b2e4 Merge remote-tracking branch 'upstream/master' into fireflash-fixes 2021-08-15 10:14:43 +02:00
joep van der velden 59f3c7b423 do_boom 2021-05-05 22:38:36 +02:00
AffectedArc07 02c91122c3 Message tweak 2021-04-05 17:29:02 +01:00
7755b4f4b4 Update code/modules/reagents/reagent_dispenser.dm
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-04-02 13:54:24 +01:00
AffectedArc07 c89089a063 Examine text + Walltank support 2021-04-02 13:43:28 +01:00
AffectedArc07 446a26ada9 Allows anchoring of fueltanks/watertanks/etc 2021-04-02 13:21:44 +01:00
Fox McCloudandGitHub 8947e97f3b Refactors Electrocution and Tesla Zapping (#15357)
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
2021-02-03 20:52:03 +00:00
AffectedArc07andGitHub 43ee2488c7 More New() -> Initialize() for /obj/structure (#15158)
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
2020-12-29 10:42:39 -05:00
01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196)
* proximity monitor

* Update code/__HELPERS/unsorted.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 13:31:16 -04:00
AffectedArc07andGitHub 90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
joep van der velden d3743f83fa Improves bomb logging and replaces single attack log msges with actual logging 2020-06-08 23:44:06 +02:00
farie82andGitHub 604daa05e1 Adds a new logging system and a logging view (#13115)
* Super early initial commit

* Why do I keep comitting this

* in between

* In between

* Sort fix. Transfer fix. HTML and more

* Scrolling + define values change

* Search fixes and time input fixes

* Minor tweaks. Fuel tank inclusion. Fixes

* derp

* Extra logging to fuel tank

* minor stuff

* add the message to admins for fueltanks

* Don't keep mob/atom references + fixes

* line fixes?

* Review improvements

* pois comment
2020-03-21 17:28:20 -06:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
CitinitedandGitHub fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
2020-02-15 13:31:08 -07:00
Fox McCloud 67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82andvariableundefined 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -04:00
Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Mark van Alphen d02165e0f9 Ruin fixes 2019-06-07 02:03:19 +02:00
Fox McCloud aba98f6cb2 fake hotspots 2019-03-20 17:11:30 -04:00
Fox McCloud 122c17a006 oh no fox lost it 2019-03-19 18:23:04 -04:00
Fox McCloud 277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
MINIMAN10000 516b7e0144 Boom function now checks for fuel before fuel tank boom. 2019-02-03 00:53:46 -08:00
tigercat2000 e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
Aurorablade 654ed40fa8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-10-24 02:21:36 -04:00
variableundefined 9de64fa8c7 Better fix 2018-10-24 06:53:31 +08:00
variableundefined b07dab729c Fix reagent dispenser getting attack cooldown 2018-10-23 21:54:46 +08:00
variableundefined 65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Aurorablade 96a59a2b53 ups tank to 3000 2018-07-20 22:58:02 -04:00
Aurorablade 38cf6c27c0 Oil tank, OIL TANK 2018-07-12 19:05:53 -04:00
Kyepandtigercat2000 412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
2018-06-13 16:55:21 -07:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Ansari f619f85655 FixGrammar 2018-05-19 08:24:01 +08:00
Ansari ed0c209e93 Expand fuel tank logging 2018-05-18 16:39:57 +08:00