Commit Graph

75 Commits

Author SHA1 Message Date
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
SabreML
6ea76cbbb3 Ambulance 2021-08-28 21:06:52 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
Qwertytoforty
8dcb2c1a0f Prevents final summon rune by being cleaned by normal methods (#16224)
* Prevents final summon rune by being cleaned by normal methods

* Makes it a proc

* Moves cleanable, makes it work with space cleaner
2021-07-08 22:20:32 +01:00
AffectedArc07
d68480b8b4 Movement configuration 2021-05-17 17:47:34 +01:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
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
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
AffectedArc07
62b618dcd4 Merge remote-tracking branch 'ParadiseSS13/master' into removes-red-cross 2021-01-28 21:35:44 +00:00
SabreML
855e603951 CanPass 2020-09-27 23:25:05 +01:00
AffectedArc07
73e90d90d1 Blank diff to test MDB 2020-07-25 10:23:24 +01:00
AffectedArc07
8aad5f7c98 Yes, I got shot by my own CI 2020-07-13 10:17:17 +01:00
AffectedArc07
38e4876453 Removes the last of the red cross 2020-07-13 10:08:03 +01:00
Aronai Sieyes
7ab32209e5 Smooth vehicles 2020-05-02 19:36:27 -04:00
AffectedArc07
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
Fox McCloud
a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -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
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
Fox McCloud
ca5a552dec red ones do go faster 2019-09-28 02:31:10 -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
Fox McCloud
71ec6419d6 fixes and icon 2019-09-27 20:36:16 -04:00
Fox McCloud
360c29008e Minor Vehicle Refactor and Balance 2019-09-27 19:59:38 -04:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud
c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
AzuleUtama
7c54de5442 Fixes a couple of object descriptions 2019-09-05 23:01:19 +01:00
joep van der velden
9db058cf5a changes as requested 2019-08-12 22:09:00 +02:00
joep van der velden
47a63e3a51 Added a few tips and fixed a bug 2019-07-29 01:42:51 +02:00
Mark van Alphen
ceceb9f3b3 Largely finish up beach ruin 2019-03-31 00:20:27 +01:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Ty-Omaha
4b11c9cdaf WEEWOO FIX 2018-10-09 15:26:44 -04:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Ty-Omaha
6b7ace83c9 WEEWOO 2018-08-27 11:01:14 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
uraniummeltdown
946ae0d58d moves var/list/armor to /obj level
adds armor to many objects
re-adds the clockcult floor sprite (accidentally removed in another PR)
adds clockcult effects to the clockcult floor
adds clockcult grilles
adds var/broken to /obj/structure
adds unused resistance_flags var
moves burn_state and resistance_flags to flags.dm
more updates to attack code
updated obj_defense.dm procs
2018-03-04 13:52:54 +05:00
uraniummeltdown
c89b1e8463 repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2018-01-18 13:03:49 +05:00
uraniummeltdown
065fc69742 moves /obj/effect/overlay/temp to their own files
code cleanup
2018-01-16 23:00:29 +05:00
Alffd
a2e9258b7b Atmos Fix 2017-11-11 00:10:21 -05:00
Alffd
7b67eec6f0 Fastest linda 2017-10-14 23:38:39 -04:00
tigercat2000
633c972f46 RnD autolathe removal + tech level overhaul 2017-06-01 11:34:29 -07:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
Markolie
02c4cd26f4 Final fixes 2017-03-05 16:42:14 +01:00
Markolie
e6b39c3185 Fixes 2017-03-05 14:31:26 +01:00
Markolie
c56fbcf312 No need to block movement 2017-02-22 20:13:36 +01:00
Markolie
fb53271664 Band aid fix for ambulance teleporting 2017-02-22 20:08:33 +01:00