cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,428 Commits 29 Branches 2 Tags
cd23b41b20ce569ff42d4fbff00a789bdb3b9729
Commit Graph

1723 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
AffectedArc07
a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
variableundefined
611163d051 Merge pull request #12706 from Ty-Omaha/Uniforms 
Updates uniforms for naval officers
 2020-03-01 23:15:46 -05:00
variableundefined
8f3b14874b Merge pull request #12701 from Ty-Omaha/uniform-v2 
Updates some uniform descriptions
 2020-03-01 23:15:31 -05:00
Fox McCloud
384a3f7279 Merge pull request #12654 from TheSardele/species-sunglasses 
Fixes sunglasses and sunglasses HUD sprites for Vox, Drask and Greys
 2020-02-24 19:51:05 -05:00
Fox McCloud
306fdd6629 Merge pull request #12934 from farie82/Item-armor-fix 
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
 2020-02-24 19:42:19 -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
joep van der velden
2cb87fffa8 Makes Veil extinguish plasmamen helmets 2020-02-11 17:10:25 +01:00
joep van der velden
c8ac344345 Fixed DNA disks runtiming (whoops) and plastic rings 2020-01-29 11:16:54 +01:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01: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
Ty-Omaha
99204689d5 Removes armor 2019-12-19 14:01:02 -05:00
Ionward
e28a38c31f Vox Softsuits (#12596) 2019-11-09 22:33:31 -05:00
Ty-Omaha
7e26d120bc grammar again sorry 2019-11-06 08:00:19 -05:00
Ty-Omaha
865cd32143 removes new() blueshield 2019-11-06 07:58:50 -05:00
Ty-Omaha
123636dad4 makes it compile 2019-11-06 07:56:43 -05:00
Ty-Omaha
7382687db4 grammar 2019-11-06 07:50:05 -05:00
Ty-Omaha
da84345a67 Revert "Revert "Updates Naval Officer Outfit"" 
This reverts commit 24cdaeb413.
 2019-11-06 07:43:54 -05:00
Ty-Omaha
24cdaeb413 Revert "Updates Naval Officer Outfit" 
This reverts commit e6997dfdbe.
 2019-11-06 07:42:46 -05:00
Ty-Omaha
e6997dfdbe Updates Naval Officer Outfit 2019-11-06 07:42:33 -05:00
Ty-Omaha
332dd77896 updates description 2019-11-05 19:41:54 -05:00
Ty-Omaha
3118b77606 Revert "Navy Uniform Fix" 
This reverts commit 1119658377.
 2019-11-05 19:31:28 -05:00
Ty-Omaha
1119658377 Navy Uniform Fix 2019-11-03 09:11:04 -05:00
TheSardele
a54a58a286 Fixes sunglasses and sunglass HUD sprites for Vox, Drask and Greys 2019-10-27 18:51:59 +01:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Ionward
2a21b501b9 Adds vox versions of Battlemage, Paranormal, Inquisitor, Berserker, and Syndicate Elite Hardsuits, fixed Wizard hardsuit action_type (#12559) 2019-10-27 00:20:07 -04:00
Fox McCloud
e25e38c2d7 Makes Pants All Powerful (#12515) 2019-10-08 20:47:32 -04:00
Fox McCloud
66b6cc4524 Merge pull request #12499 from Ionward/drask-oct4-medspritefix 
Drask Surgical Cap/Mask Sprite fix
 2019-10-07 23:09:46 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Ionward
63c2c00733 adds drask surgical cap and fixes incorrect path for drask surgery mask 2019-10-04 11:55:49 -07:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -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
652920ae3c Wizard Battlemage Armor (#12388) 2019-09-24 15:42:47 -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
TDSSS
41b638bd33 Gloves stuff 2019-09-21 21:34:08 +02: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
Ionward
4b87b5b42a Oh, didn't you hear? I'm the King of the Rhumba beat. (#12339) 2019-09-20 17:58:31 -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
Ionward
51e0afaaf0 fixes atmos_hardsuit item state typo, and adds plasmaman librarian helmet 2019-09-15 17:37:00 -07: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