cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-17 21:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,875 Commits 27 Branches 2 Tags
1c05fb85e6ff92569f0796bf4ea984068fbaffc2
Commit Graph

3496 Commits

Author SHA1 Message Date
Fox McCloud
39cc83501b Fixes Explosions (#12539) 2019-10-09 09:58:27 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud
a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -04:00
Fox McCloud
f4451fcb3d Fixes Universal Damage Issues. Implements Proper Ricochets (#12532) 2019-10-08 20:41:40 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
variableundefined
3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage 
Universal Object Damage
 2019-10-06 23:22:48 -04:00
Fox McCloud
5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
SteelSlayer
0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
Fox McCloud
99a6ee7827 the-bleakest-void-of-memento-mori 2019-10-02 00:38:08 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefined
e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07: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
Mars
8b87bd529c Slight refactor of conscription kit 2019-09-27 17:44:06 +02:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Mark van Alphen
6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
AzuleUtama
da0375028f Fixes incorrect description for Traitor's Meat Cleaver (#12397) 2019-09-23 15:25:53 -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
Dave
2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayer
94bb14bb29 Datumizes traitors and mindslaves (#11969) 2019-09-21 16:50:03 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
 2019-09-21 12:40:07 -04:00
Fox McCloud
d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
TDSSS
840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
Fox McCloud
6711f92099 Merge pull request #12326 from Couls/missing-keyword-args 
fixes some missing arguments and runtimes
 2019-09-17 21:03:11 -04:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Dave
e0ca504de0 OK, you caught me, I did use the web editor 
But it was just to edit plaintext values, don't hurt me.
 2019-09-16 12:48:27 -04:00
Dave
eba05d3e91 Shield desc fix 2019-09-16 12:23:08 -04:00
Fox McCloud
788f1926fb though-our-bodies-be-ravaged 2019-09-15 19:49:52 -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
variableundefined
894ffab1ae Merge pull request #12277 from Fox-McCloud/removes-roman-armor 
Removes Real Armor from Autodrobe
 2019-09-13 08:15:46 -04:00
variableundefined
9c88e72cc3 Merge pull request #12271 from AzuleUtama/nukeOpsItemTweaks 
Nuclear Operative Item Tweaks
 2019-09-12 19:49:34 -04:00
Fox McCloud
94a2861039 Removes Real Armor from Autodrobe 2019-09-12 01:07:58 -04:00
Fox McCloud
6f516d0303 Merge remote-tracking branch 'upstream/master' into ash-drake-rework 2019-09-12 00:42:34 -04:00
variableundefined
db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
variableundefined
bcd64e99be Merge pull request #12255 from Fox-McCloud/shards-glass-lights 
Refactors Shards, Improved Light Replacer, Adds Plasmaspear
 2019-09-11 10:10:18 -04:00
Fox McCloud
5943ad2902 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-10 07:09:30 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud
7e0190b46a fix 2019-09-10 03:21:41 -04:00
Fox McCloud
40428e47d9 Refactors Shards, Improved Light Replacer, Adds Plasmaspear 2019-09-10 03:08:44 -04:00
variableundefined
69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00