e305530d59
Obliterates Zombies
2020-07-02 21:22:55 +01:00
6d3f4a98e8
Nerfs Trashbags ( #13545 )
2020-06-23 17:19:03 -04:00
2cbe6f470c
call parent
2020-05-28 12:57:08 -05:00
8b8423574a
borg alt click fix
2020-05-27 16:12:03 -05:00
defbf5b6df
Lizard skin handbag ( #13477 )
...
* lizard handbag crafting recipe
* lizard handbag item
* lizard handbag sprites
* Fix styling of skin recipes
2020-05-24 14:07:41 -04:00
9fcb19126e
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts
2020-05-18 09:22:27 +02:00
d8134fd328
Refactor and Fixes EMP's ( #13420 )
2020-05-14 20:39:44 -04:00
faecf7cbfa
Patch rework ( #13062 )
...
* Patch Rework Part 1
* applicator
* fixes
* fixes
* temperature settings
* single application patches
* additional
* new line fix
* fox is a derp sometimes
2020-05-02 20:07:43 -04:00
61adc6abb9
Add wizard loadouts
2020-03-22 12:32:51 +01:00
fb9a10a681
More storage alt-click storage fixes ( #13145 )
...
* fix not being able to open secure wall safes
* add fingerprint handling and bag-opening sound
Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com >
2020-03-20 22:03:27 -06:00
210f8badf4
Makes all global variables handled by the GLOB controller ( #13152 )
...
* Handlers converted, now to fix 3532 compile errors
* 3532 compile fixes later, got runtimes on startup
* Well the server loads now atleast
* Take 2
* Oops
2020-03-20 21:56:37 -06:00
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
4a12c0bb5c
Fixes some oversights with storage altclicking
...
Update secure.dm
2020-03-15 11:40:36 -05:00
48d0dfdacc
Merge pull request #12863 from SteelSlayer/altclick-storage
...
Adds an alt-click shortcut for opening storage items
2020-03-14 23:26:05 -04:00
276bf1adc2
this makes more sense
2020-03-14 15:26:26 -05:00
c167bbd52d
Merge pull request #12644 from datlo/hisgraceimprovement
...
Make His Grace simpler to link with
2020-03-14 15:58:58 -04:00
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
5baaabe12e
Merge branch 'master' into var/const-to-define
2020-03-09 10:33:59 +00:00
47263ded27
Merge remote-tracking branch 'upstream/master' into cig-tweaks
2020-03-08 22:35:49 -04:00
edebec5194
Merge pull request #13021 from Fox-McCloud/add-cbd
...
Adds CBD
2020-03-08 21:46:20 -04:00
d8a934381c
Merge pull request #12854 from Darkmight9/ERT_and_Dsquad_bag_space
...
Increases bag space of ERTs and death squads
2020-03-08 03:34:23 -04:00
4d9c89bdc0
menthol
2020-03-06 23:48:32 -05:00
c9bc00f654
grammar errors
2020-03-04 14:52:40 +08:00
b43f41ee47
making sure Rapaskoti's new icons work, and coding what they wanted to do.
...
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com >
2020-03-04 14:27:41 +08:00
c059b6ba95
Cigarette Tweaks
2020-03-04 00:32:39 -05:00
a1fa46f5a8
Merge branch 'master' into var/const-to-define
2020-03-03 22:44:07 +00:00
8f297aa4d0
Merge pull request #12683 from MarsM0nd/order_conscription_kit
...
Brings orderable conscription kit in line.
2020-02-24 19:48:46 -05:00
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
c55ce4aab3
Adds CBD
2020-02-23 19:46:29 -05:00
8671439f11
Merge branch 'master' into var/const-to-define
2020-02-22 16:30:01 +00: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
5ca4ea4025
Removed unneeded New procs
2020-02-07 20:38:09 +01:00
fd913498bf
Make every obj/.../New() call it's parents
2020-01-29 10:43:32 +01:00
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
b015fbd163
Adds an alt-click shortcut for opening storage items
2019-12-29 21:30:08 -06:00
c5ee1c68dd
Increases bag space of ERTs and death squads
2019-12-27 18:59:07 -05:00
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
f2f7ec956a
Orderable conscription kit only without ID
2019-10-31 15:43:35 +01:00
00f5e0613c
Stamina Damage Rework ( #12591 )
2019-10-27 00:23:22 -04:00
393b248835
Removes Ancient Storage Codersprite ( #12594 )
2019-10-27 00:22:12 -04:00
6368447f83
Add nodrop notification
2019-10-24 20:41:36 +02:00
902b270ab1
His grace action button now links the box
2019-10-24 20:31:54 +02:00
39cc83501b
Fixes Explosions ( #12539 )
2019-10-09 09:58:27 -04:00
5194094d3a
Refactors Zone Selection ( #12523 )
2019-10-08 21:11:09 -04:00
f4451fcb3d
Fixes Universal Damage Issues. Implements Proper Ricochets ( #12532 )
2019-10-08 20:41:40 -04:00
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
2224229fad
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-30 14:18:33 -04:00
e02a76aa73
Fixes too many items in the conscription kit #12436
2019-09-29 19:41:07 -07: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
8b87bd529c
Slight refactor of conscription kit
2019-09-27 17:44:06 +02:00
AffectedArc07