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

1919 Commits

Author SHA1 Message Date
Mitchell
8e75487346 Fixes CLRF 2020-03-17 17:43:11 -05:00
Mitchell
230e3d8abc Merge branch 'master' into adddefibs 2020-03-17 17:26:29 -05:00
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
Mitchell
a65bb8e1e6 Zap Zap 2020-03-14 15:21:50 -05:00
Fox McCloud
8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define 
Replaces all var/const with #define
 2020-03-14 15:33:44 -04:00
Fox McCloud
98b5a8014f Merge pull request #13028 from farie82/barrier-walking 
Walking through barriers now also lets a dragged carbon get through
 2020-03-14 15:11:40 -04:00
Fox McCloud
3df642ffa4 Merge pull request #12678 from Kyep/depot_loot_fix 
Fixes 12677 - depot self-destruct leaves loot behind
 2020-03-14 15:03:09 -04:00
Fox McCloud
c48ad34c2d Merge pull request #13061 from Quantum-M/aiLockerCheese 
AI Cores are no longer able to fit in a locker
 2020-03-14 14:19:41 -04:00
Bryan
34d214cbb3 Requested Changes 2020-03-09 10:22:59 -07:00
AffectedArc07
5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
farie82
761ada255b Update holosign.dm 2020-03-08 08:53:50 +01:00
Kyep
7b06d2c2ea Merge remote-tracking branch 'ParadiseSS13/master' into depot_loot_fix 2020-03-07 23:25:20 -08:00
Kyep
394aff3a73 removes E.Destroy() 2020-03-07 23:25:06 -08:00
Fox McCloud
37cc564a1e Merge pull request #12704 from moxian/paper-uid 
Make paperwork popups use UID as a window id.
 2020-03-07 18:50:54 -05:00
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Bryan
e89a72d4f8 AI locker cheese 2020-03-01 16:38:04 -07:00
joep van der velden
1dc7542473 Walking through barriers now also lets a dragged carbon get through 2020-02-25 11:30:34 +01:00
AffectedArc07
8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
Citinited
b5ef242d92 Dismantling tables using a screwdriver will leave a table frame 2020-02-16 11:52:22 +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
Kyep
2fd66d8510 replaces lentext() with length() 2020-01-06 16:01:20 -08:00
Kyep
13147538e7 Makes fusion overload immune to explosions 2019-12-28 14:52:29 -08:00
Crazy Lemon
b50b3f332e Merge pull request #12808 from FreeStylaLT/reflecting_on_reflections 
Fixes reflectors and a Projectile angle bug
 2019-12-16 18:36:49 -08:00
FreeStylaLT
d911954920 Fixes reflectors and a Projectile angle bug 2019-12-15 12:04:29 +02:00
unknown
efb2d3cd5c fixed 3 UOD bugs 2019-12-11 18:46:42 -05:00
moxian
a9c19ebb6b Make paperwork popups use UID as a window id. 2019-11-06 04:40:16 +00:00
Kyep
88d83b3ded Fixes 12677 - depot self-destruct leaves loot behind 2019-10-30 21:27:21 -07:00
Terilia
49a70daba0 A red headcrab day (#12396) 2019-10-27 00:26:34 -04:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud
209379d22a Nerfs Glass Armor (#12544) 2019-10-27 00:19:13 -04:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Ty-Omaha
4c921b929a Gives Captains access to unlock their display case again (#12556) 2019-10-12 16:04:39 -04:00
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
SteelSlayer
e9d463576f Reaper cult sprite overhaul (#12513) 2019-10-08 20:55:16 -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
9e03f75a4b I-carry-onward 2019-10-06 00:26:03 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud
5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
variableundefined
2a27aaa1ff Syringe Refactor. Overhauls Lethal Injection Syringe (#12467) 
* Syringe Refactor. Overhauls Lethal Injection Syringe

* fixes
 2019-10-04 14:48:35 -04:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
TDSSS
b58d3998e8 Fixes beach visual bugs (#12487) 2019-10-03 08:28:57 -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
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
MrMagolor
80bb221891 Adds an ATMOS Holofan Creator to the Chief Engineer's locker (#12419) 2019-09-26 16:59:20 -07:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00