cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
2771 Commits
Author SHA1 Message Date
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 McCloudandvariableundefined cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloudandvariableundefined 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
TDSSSandvariableundefined 840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
Fox McCloudandvariableundefined 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
variableundefinedandGitHub 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 McCloudandGitHub 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
variableundefinedandGitHub 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
SteelSlayer ab4f40f253 Update iv_bag.dm 
Adds 20 to the transfer amounst list as requested
 2019-08-24 23:53:57 -04:00
SteelSlayer 188f66febc Update iv_bag.dm 
fixes chat wording
 2019-08-24 23:06:36 -04:00
SteelSlayer 8c37b3724b initial 2019-08-24 22:43:19 -04:00
variableundefinedandGitHub 806c00ba68 Merge pull request #12039 from Fox-McCloud/more-lavaland-updates 
More Lavaland Updates: Primal and Bayonets
 2019-08-21 22:38:25 -04:00
Fox McCloud 52f263ba01 Tweaks/Buffs Survival Pen 2019-08-20 15:02:15 -04:00
Fox McCloud 3667557b60 More Lavaland Updates: Primal and Bayonets 2019-08-19 20:02:53 -04:00
variableundefinedandGitHub 11e9ecadbf Merge pull request #11894 from TheSardele/blender 
Makes All-In-One Grinders constructable
 2019-08-16 20:41:18 +08:00
Arkatos1 bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
Fox McCloud 0189cd1dee Diona Rework 2019-08-12 01:51:29 -04:00
Fox McCloudandGitHub 940f87b210 Merge pull request #11942 from Couls/clown-buff 
Waddling component, clowns can now choose to waddle while they walk, penguins automatically waddle
 2019-08-11 20:54:04 -04:00
variableundefinedandGitHub 0b04d71445 Merge pull request #11515 from Tayyyyyyy/sanitize 
Sanitize all inputs
 2019-08-11 22:09:10 +08:00
variableundefinedandGitHub d5ba74c1ba Merge pull request #11612 from farie82/viro-clear-and-eject 
The Empty beaker button from the pandemic now also ejects
 2019-08-11 15:01:25 +08:00