cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-18 10:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,237 Commits 12 Branches 2 Tags
073fefd8564187706ec56f85229bf659d3b7e756
Commit Graph

5330 Commits

Author SHA1 Message Date
Ty-Omaha
77dd66942e Barber scissors refactor (#13038) 
* Scissor refactor

* removed junk from comment
 2020-03-01 13:08:28 -07:00
Fox McCloud
8f297aa4d0 Merge pull request #12683 from MarsM0nd/order_conscription_kit 
Brings orderable conscription kit in line.
 2020-02-24 19:48:46 -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
variableundefined
ee10addad1 Prevent stacks from being consumed by redspace. (#12661) 
* Fix stacks being consumed by redspace.

Fixes #12606

* Add comment on why (I think) the stack fix happens to work.

* Fix a potential minor logic error.

If the stack has no items left, we drop it, it gets merged
with another stack on the ground, then we should still report
the stack as having zero items.

Otherwise there's a potential to accidentally use items on the ground
once you run out of items in hand, which is slightly surprising.
 2020-02-15 22:53:40 -05:00
farie82
c0010a0249 Makes the mindslave message bigger (#12960) 2020-02-15 17:36:51 -07: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
5ca4ea4025 Removed unneeded New procs 2020-02-07 20:38:09 +01:00
joep van der velden
fd913498bf Make every obj/.../New() call it's parents 2020-01-29 10:43:32 +01:00
Lumi
e6090ea530 Adds vox-themed plushie. (#12745) 2019-12-17 22:32:24 -05:00
Crazy Lemon
cc72b2fa5e Merge pull request #12811 from Kyep/link_update_2 
Domain link updates 2
 2019-12-16 19:55:08 -08:00
Crazy Lemon
bd9f26e264 Merge pull request #12731 from Cazdon/miniMedsBranch 
Rolls of Gauze and Ointments now heal 10 brute or burn respectively.
 2019-12-16 19:16:23 -08:00
Kyep
fc650c273a domain links update 2 2019-12-16 18:55:51 -08:00
Darkmight9
f3ad67bd73 Changes the spray bottle in the full janitor belt to one with space cleaner in it 2019-12-12 17:27:52 -05:00
unknown
a071b23ff9 Made gauze and ointment heal for 10 brute or burn respectively. 2019-11-14 20:30:23 -05:00
moxian
1d0b84addb Fix prisoner implant z-level checking. 
- Can no longer hide in a locker from prisoner computer tracking
- locator no longer tracks implanted people across z-levels
 2019-11-09 10:17:41 +00:00
Mars
f2f7ec956a Orderable conscription kit only without ID 2019-10-31 15:43:35 +01:00
moxian
6520b32e56 Fix a potential minor logic error. 
If the stack has no items left, we drop it, it gets merged
with another stack on the ground, then we should still report
the stack as having zero items.

Otherwise there's a potential to accidentally use items on the ground
once you run out of items in hand, which is slightly surprising.
 2019-10-31 03:42:04 +00:00
moxian
4fab6f14e6 Add comment on why (I think) the stack fix happens to work. 2019-10-28 10:34:47 +00:00
moxian
a24013be5b Fix stacks being consumed by redspace. 
Fixes #12606
 2019-10-28 10:21:06 +00:00
Darkmight9
19a29319de Decorations galore part 1! (#12615) 2019-10-27 00:30:05 -04:00
Evankhell561
af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloud
00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud
393b248835 Removes Ancient Storage Codersprite (#12594) 2019-10-27 00:22:12 -04:00
TDSSS
76ab2c7700 Makes yellow documents destructible (#12540) 2019-10-27 00:19:40 -04:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
AzuleUtama
3586683ef7 Vampire shapeshift and DNA scrambler clear flavourtext on use (#12546) 2019-10-15 20:07:40 -04:00
Fox McCloud
39cc83501b Fixes Explosions (#12539) 2019-10-09 09:58:27 -04:00
Fox McCloud
c8eebd1b4b Adds Leather to Biogenerator (#12514) 2019-10-08 21:12:09 -04:00
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
SteelSlayer
e9d463576f Reaper cult sprite overhaul (#12513) 2019-10-08 20:55:16 -04:00
Fox McCloud
f4451fcb3d Fixes Universal Damage Issues. Implements Proper Ricochets (#12532) 2019-10-08 20:41:40 -04:00
Fox McCloud
86f626c9fd Merge pull request #12498 from Darkmight9/Hand-held-defib-new-sprite 
Gives the handheld defib a new sprite
 2019-10-08 05:22:00 -04:00
Fox McCloud
93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
Fox McCloud
bb6cadef7a Health Analyzer Refactor (#12511) 2019-10-07 23:15:09 -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
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Darkmight9
da2fdc0c03 handheld 2019-10-04 20:10:28 -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
SteelSlayer
0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -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
2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefined
e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07:00
AzuleUtama
4bdfc4c32b Camera bug now lists cameras in alphabetical order (#12427) 2019-09-29 19:13:19 -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