Commit Graph

371 Commits

Author SHA1 Message Date
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
TDSSS
01bd22c34c Welded vents bursting open (#12481) 2019-10-04 14:46:49 -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
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
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
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04: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
variableundefined
2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners
Airlock spawners 2: Electric Boogaloo
2019-08-12 13:30:26 +08:00
Couls
5979166f54 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-06-02 21:59:58 -04:00
Couls
fe68c74466 Merge branch 'master' into diagonal-movement 2019-05-22 14:24:54 -04:00
Citinited
d3585beb8b Code cleanup, runtime fixing 2019-05-07 21:59:43 +01:00
Couls
fb619648a9 Resolve conflicts 2019-05-03 22:28:04 -04:00
Mark van Alphen
9009cd443e Fix pipe layering 2019-05-04 00:47:16 +02:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
92ec9cf253 Merge pull request #11348 from Arkatos1/AtmosShortcut
Adds shortcuts for handling pumps, volume pumps, filters, and mixers + Ability to rename them with a pen
2019-04-30 12:10:52 +08:00
Citinited
9976ad9ea1 Adds airlock spawners 2019-04-27 21:41:36 +01:00
Couls
39dd7c3f86 Moving diagonal in pipes no longer ejects you 2019-04-27 09:51:11 -04:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Mark van Alphen
c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Arkatos1
fa6a27e3a9 Fixes invalid indentation 2019-04-22 18:49:30 +02:00
Arkatos1
cc35fb8b0c Code improvement 2019-04-22 18:43:17 +02:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything
Gives the orphans a home
2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1
b00c44d701 Added ability to rename devices with a pen, sanity checks, reduced code spaghetti 2019-04-21 19:27:54 +02:00
Arkatos1
3f6b8478ff Added atmos shortcut for pumps, volume pumps, filters and mixers 2019-04-21 17:06:34 +02:00
Mark van Alphen
f9d067e9e6 Remove rotatium from vent_clog and remove useless return 2019-04-21 01:54:31 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Fox McCloud
489359d6d1 Adds Unidentified Gas in Deep Space 2019-03-22 16:00:56 -04:00
Certhic
6850d3d27a multitool fixes 2018-11-20 14:21:25 +01:00
Certhic
e3f852dff6 magic numbers 2018-11-16 15:32:49 +01:00
variableundefined
544e548f4e Merge pull request #9624 from alex-gh/unary_pipe_fix
It is no longer possible to duplicate uvents.
2018-10-20 08:37:53 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
alex-gh
8898c7346b It is no longer possible to duplicate uvents. 2018-09-27 22:52:16 +02:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
tigercat2000
695d7b7c23 Remove debugging stuff 2018-04-28 18:04:38 -07:00
tigercat2000
7d8c9a731a SS Conversion: Atoms, Machines, n' Mobs
This converts the machine and mob processes to the SMC. Additionally, it
adds the Atom subsystem, which handles all Initialize() calls in place
of the old gameticker. Due to incompatibility with our atmospherics
(FUCK OUR ATMOSPHERICS FOR FUCKING EVER JESUS CHRIST WHO THE FUCK MADE
THIS PIECE OF GODDAMN SHIT) atmospherics machines do not use
Initialize() as they should, instead opting for a custom atmos_init
proc that the air controller handles.
2018-04-28 17:55:15 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
2b25584372 Merge remote-tracking branch 'upstream/master' into remove-weapons 2018-04-19 17:01:38 -04:00