cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 26 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

892 Commits

Author SHA1 Message Date
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
variableundefined
4c24624313 Merge pull request #13027 from Fox-McCloud/goonchem-heparin 
Goonchem: Heparin Rework
 2020-03-14 23:53:42 -04:00
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
variableundefined
073fefd856 Merge pull request #12843 from farie82/antidrop-implant-fix 
Anti drop implants now don't break shit when EMPed
 2020-03-05 18:32:07 -05:00
Fox McCloud
9d9d6a8666 Goonchem: Heparin Rework 2020-02-24 18:29:08 -05:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Citinited
fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700) 
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
 2020-02-15 13:31:08 -07:00
farie82
5b1941e784 Fixes a few runtimes (#12893) 
* Some runtime fixes

* fixes #12892

* Alternative fix. Better behaviour

* qdel atmos thingy when loc is null

* Eye colour init protection

* Whoops. Forgotten /

* Suggestions update

* Fixed a runtime where IPCs losing their arms would cause a runtime in the hand

* Fixes mobs being able to nuzzle a grill to dead and a runtime there

* Added extra logging to the NPCpools
 2020-02-14 22:17:29 -07:00
AffectedArc07
c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Nokko
cf2145a953 Another spelling fix in surgery (#12885) 
Fixed misspelling in surgery saw fail step
 2020-01-07 14:46:47 -05:00
joep van der velden
fe85dd8293 Anti drop implants now don't break shit when EMPed 2019-12-23 22:39:09 +01:00
Crazy Lemon
3191674f89 Merge pull request #12744 from SteelSlayer/slime-cluwne-no-die 
Getting cluwned ignores species brain damage modifiers
 2019-12-16 19:03:08 -08:00
Crazy Lemon
b2679ff0e1 Merge pull request #12748 from SteelSlayer/incision-examine 
Adds examine text for people who have open surgical incisions
 2019-12-16 18:44:03 -08:00
SteelSlayer
df2de1931e use_brain_mod 2019-12-14 00:13:28 -06:00
Nokko
4af6e8a243 Fix minor spelling error in surgery 
```diff
-- KOM-RAD's hand slips, tearing blood vessals and causing massive bleeding in Vampy The Vampiric Clown's lower body with the hemostat!
++ KOM-RAD's hand slips, tearing blood vessels and causing massive bleeding in Vampy The Vampiric Clown's lower body with the hemostat!
```
 2019-12-11 21:41:45 -08:00
SteelSlayer
2a54c79256 Adds examine text for people who have open incisions 
Update examine.dm
 2019-11-21 19:39:23 -06:00
SteelSlayer
4705a89676 Makes cluwning ignore brain damage modifiers 
Update organ_internal.dm
 2019-11-18 18:48:46 -06:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud
45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -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
5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
Couls
8129a6828a Change reviver to be new-crit friendly (#12464) 2019-10-04 14:48:20 -04:00
Fox McCloud
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
Coul
30cce3e730 Merge remote-tracking branch 'upstream/master' into rename-organs 2019-09-30 12:29:48 -04:00
variableundefined
4d0d32aa66 Remove encased var from unbreakable limbs 2019-09-29 19:42:10 -07:00
variableundefined
c2bba81a4e Merge pull request #12429 from JKnutson101/roboCosmetic 
Allows for robotic hands, feet, and groin to undergo customization surgery.
 2019-09-29 19:40:35 -07:00
Couls
639d585fa6 Fix heart icons going invisible (#12444) 2019-09-28 12:20:23 -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
Coul
a993b80959 remove ribs and skull from unbreakable limbs 2019-09-27 20:45:01 -04:00
Coul
30fcaf11af rename slime organs to be more player friendly 2019-09-27 20:29:30 -04:00
Couls
56d994b464 Slime people rework (#11990) 2019-09-26 16:53:09 -07:00
unknown
7d1978fabe added, left and right hands and feet and groin to list of cosmetic robotic surgeries 2019-09-26 18:53: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
Fox McCloud
d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
Fox McCloud
593c18cb42 Vox Rework (#12343) 2019-09-20 17:58:59 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Coul
d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -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
60c04285cf Bubblegum rework 2019-09-11 23:06:34 -04:00
Fox McCloud
d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud
92411d7a02 Merge pull request #11853 from Kyep/ts_gateway_fix 
Terror Spider Fixes & Tweaks
 2019-09-08 03:51:59 -04:00
Kyep
c5b4cdab3a fixes eggs not causing confusion as intended 2019-09-06 23:58:43 -07:00
Fox McCloud
8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -04:00