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

2133 Commits

Author SHA1 Message Date
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
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
e0db0c186f in-his-name-amen 2019-10-06 14:29:12 -04: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
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
13d1c92995 fixes 2019-09-30 18:50:17 -04:00
Fox McCloud
a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -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
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
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
TDSSS
840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
Fox McCloud
5810d28571 Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325) 2019-09-17 16:06:43 -07: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
Fox McCloud
d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -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
TDSSS
533f525c11 logging changes 2019-09-15 08:43:47 +02:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
variableundefined
e571d30f74 Merge pull request #12266 from Fox-McCloud/hydro-update 
Hydroponics Update: Growable Ash Flora
 2019-09-12 22:40:01 -04:00
AzuleUtama
c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud
08ac93ae60 Merge pull request #12265 from TDSSS/godblood-fix 
Fix really silly mistake
 2019-09-11 06:38:47 -04:00
Fox McCloud
91d08fb1f6 garlic reagent 2019-09-11 06:33:03 -04:00
TDSSS
f02cbc4e60 [Comment redacted] 2019-09-11 12:05:47 +02:00
Fox McCloud
5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
TDSSS
86eb450c56 Fix really silly mistake 2019-09-11 07:48:45 +02:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud
a1f85926ba fix 2019-09-09 17:55:08 -04:00
Fox McCloud
cdd5190e36 Fixes Some Tastes; Tweaks a Few 2019-09-09 17:47:26 -04:00
Fox McCloud
177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
Fox McCloud
a7cc0db002 Fixes Romerol Reagent Pathing 2019-09-04 00:08:46 -04:00
Fox McCloud
e5cc59bfca ensures sleepy pens work 2019-09-03 23:42:34 -04:00
Fox McCloud
8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -04:00
Couls
7ad4479f58 description not message 2019-09-03 20:39:31 -04:00
Coul
6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Coul
5045980323 review changes 2019-09-02 05:32:15 -04:00
Fox McCloud
94cd248b20 Fixes Some Null Tastes and Fruit Wine 2019-09-01 18:59:13 -04:00
variableundefined
3dca5d09ec Code styling + Vitamin 2019-08-31 20:00:52 -04:00
variableundefined
a5c0138dda Deconflict and revert an accidental iconstate name change 2019-08-31 09:18:36 -04:00
Fox McCloud
bdd17ee978 Fixes Strange Reagent Revival Case 2019-08-29 23:59:45 -04:00
variableundefined
b488d9d27e Merge pull request #11989 from Fox-McCloud/diona-refactor 
Diona Rework
 2019-08-27 18:03:47 -04:00
variableundefined
83751e8e74 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into TasteOfVictory 2019-08-27 15:20:23 -04:00