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
af9ed93abf
Fixes this
2020-02-22 16:39:41 +00:00
8671439f11
Merge branch 'master' into var/const-to-define
2020-02-22 16:30:01 +00:00
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
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
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
a071b23ff9
Made gauze and ointment heal for 10 brute or burn respectively.
2019-11-14 20:30:23 -05:00
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
4fab6f14e6
Add comment on why (I think) the stack fix happens to work.
2019-10-28 10:34:47 +00:00
a24013be5b
Fix stacks being consumed by redspace.
...
Fixes #12606
2019-10-28 10:21:06 +00:00
c8eebd1b4b
Adds Leather to Biogenerator ( #12514 )
2019-10-08 21:12:09 -04:00
5194094d3a
Refactors Zone Selection ( #12523 )
2019-10-08 21:11:09 -04:00
e9d463576f
Reaper cult sprite overhaul ( #12513 )
2019-10-08 20:55:16 -04:00
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
5170f3fbae
the-strength-of-this-world-fades
2019-10-04 19:34:08 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
a97d050f4b
Syringe Refactor. Overhauls Lethal Injection Syringe
2019-09-30 18:25:36 -04:00
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
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
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
5810d28571
Refactors Simple Mob Creation: Adjusts Which Mobs are Available ( #12325 )
2019-09-17 16:06:43 -07:00
aa49033844
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
788f1926fb
though-our-bodies-be-ravaged
2019-09-15 19:49:52 -04:00
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
18b270cb7e
Remove the structure/chair/wood/normal subtype, moving all properties to its parent.
2019-09-11 00:28:27 -04:00
f998cb74ad
then-we-shall-reforge-the-armor-from-what-remains
2019-09-10 07:03:05 -04:00
8587f63982
Refactors Spawners/Tendrils
2019-09-07 20:02:53 -04:00
9f2f9cfa6c
Merge remote-tracking branch 'upstream/master' into ports-tailoring
2019-08-27 18:23:11 -04:00
eef0bc919d
Implements Tailoring
2019-08-26 17:41:39 -04:00
1befa092be
Adds Sandbags Reworks Security Barricades
2019-08-26 03:21:45 -04:00
85c6997584
Merge remote-tracking branch 'upstream/master' into plasmamen-rework
...
# Conflicts:
# code/modules/mob/living/carbon/human/update_icons.dm
# icons/obj/device.dmi
# paradise.dme
2019-08-25 16:51:21 -04:00
3667557b60
More Lavaland Updates: Primal and Bayonets
2019-08-19 20:02:53 -04:00
39c9e9abde
Reworks Plasmamen
2019-08-11 18:56:32 -04:00
9eff8a8663
Merge pull request #11696 from Markolie/shuttlechairs
...
Add shuttle chairs (and fix newlines on all maps)
2019-08-11 16:32:14 +08:00
673d1c9f78
Merge pull request #11611 from farie82/blindfold-craftable
...
Blindfolds are now craftable from 3 cloth
2019-08-11 15:00:34 +08:00
2ae1fc7ac2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# icons/obj/chairs.dmi
2019-08-09 23:41:07 +02:00
14e8022daf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
...
# Conflicts:
# code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
f1899f0050
Merge pull request #11697 from Markolie/tribalhealing
...
Add tribal splints, ash walker tweaks and Lavaland tweaks
2019-08-09 17:22:22 -04:00
8c8950bf07
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2019-07-15 20:37:44 +02:00
88fa0d27df
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
...
# Conflicts:
# paradise.dme
2019-07-15 20:30:54 +02:00
fd579015b1
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
e42e1af87a
Merge pull request #11634 from Markolie/laborstacker
...
Updates the prison labor point system
2019-07-09 18:21:58 +08:00
e0a21759fb
Add tribal splints
2019-06-07 04:06:12 +02:00
bc12891f02
Move shuttle seat out of comfy chairs category
2019-06-07 03:59:45 +02:00
f56854292a
Add shuttle chairs (and fix newlines on all maps)
2019-06-07 03:39:24 +02:00
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
1988ae34d8
Merge pull request #11643 from Markolie/turfs
...
Lavaland fixes, continued
2019-06-02 17:58:56 -07:00
d94906e19a
Merge pull request #11656 from Markolie/multiplier
...
Fixes an exploit with the sheet multiplier
2019-06-02 15:52:37 -07:00
c6e6c6cefd
Even better water handling
2019-06-03 00:31:03 +02:00
AffectedArc07