95b0430e2d
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts
2020-03-23 11:14:57 +01:00
ebded4f39e
Logging prio changes ( #13174 )
2020-03-22 20:47:51 -06:00
d3cc0526d7
mob display name and text change
2020-03-22 19:49:36 +01:00
68c06c7ceb
Adds LOGS to the PP. Adds add mob (by ckey)
2020-03-22 18:53:58 +01:00
9ff8a23ae2
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts
2020-03-22 12:32:54 +01:00
61adc6abb9
Add wizard loadouts
2020-03-22 12:32:51 +01:00
2562323e5c
Merge branch 'master' into wiz-armor-fix
2020-03-22 03:39:18 +01:00
604daa05e1
Adds a new logging system and a logging view ( #13115 )
...
* Super early initial commit
* Why do I keep comitting this
* in between
* In between
* Sort fix. Transfer fix. HTML and more
* Scrolling + define values change
* Search fixes and time input fixes
* Minor tweaks. Fuel tank inclusion. Fixes
* derp
* Extra logging to fuel tank
* minor stuff
* add the message to admins for fueltanks
* Don't keep mob/atom references + fixes
* line fixes?
* Review improvements
* pois comment
2020-03-21 17:28:20 -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
cc6c8d35a8
Merge remote-tracking branch 'upstream/master' into hypoglycemia
...
# Conflicts:
# code/datums/diseases/critical.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/life.dm
2020-03-19 13:47:31 -04:00
d4a55be805
Merge branch 'master' into wiz-armor-fix
2020-03-18 00:23:54 +01: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
4c24624313
Merge pull request #13027 from Fox-McCloud/goonchem-heparin
...
Goonchem: Heparin Rework
2020-03-14 23:53:42 -04:00
e75c926a62
tweak
2020-03-10 16:53:55 -04:00
e364612d2a
Arch wizards get actual space suits
2020-03-10 13:03:07 +01:00
97527cbd82
Hypoglycemia
2020-03-09 18:15:20 -04:00
9d9d6a8666
Goonchem: Heparin Rework
2020-02-24 18:29:08 -05:00
8671439f11
Merge branch 'master' into var/const-to-define
2020-02-22 16:30:01 +00:00
8322583026
Allow numbers vv name ( #12664 )
...
Allow admins to rename people with numbers
2020-02-15 22:53:16 -05:00
f59497fa09
Cult Fixes and Tweaks: Admins can cult anyone, Constructs get their comms back. ( #12816 )
...
* allows admins to cult anyone
* Constructs get cult chat again
* made it ONLY cult constructs get cult comms
2020-02-15 20:23:52 -07: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
df09966258
Instant Summons spell now respects no_drop and teleports the holder of the nodrop item to the wizard now ( #12961 )
...
* Instant recall spell now respects no_drop
* Teleports the holder to the wizard instead now
2020-02-14 21:54:01 -07:00
2e7783ccf1
Merge branch 'master' into cargo-crate-list-fix
2020-02-14 14:38:40 -06:00
91643c1a0a
Merge pull request #12658 from Kyep/mouse_squeak_fix
...
Dead mice squeak no tails
2020-02-06 21:53:10 -07:00
c64bc93649
Replaces all var/const with #define
2020-01-28 21:25:20 +00:00
bda2ea1df9
Fixes a part of the gas sample comparison
...
CO2 comparison now uses the CO2 from the sample, instead of oxygen.
2020-01-10 16:43:48 -05:00
3191674f89
Merge pull request #12744 from SteelSlayer/slime-cluwne-no-die
...
Getting cluwned ignores species brain damage modifiers
2019-12-16 19:03:08 -08:00
df2de1931e
use_brain_mod
2019-12-14 00:13:28 -06:00
4705a89676
Makes cluwning ignore brain damage modifiers
...
Update organ_internal.dm
2019-11-18 18:48:46 -06:00
6dbfd469a2
Adds a cancel button to the wizard teleport spell
2019-11-10 11:31:02 -06:00
45c4ff46b4
Minor cargo supply crate pathing change
2019-10-30 20:06:53 -05:00
9061742db5
Dead mice squeak no tails
2019-10-27 23:16:42 -07:00
19a29319de
Decorations galore part 1! ( #12615 )
2019-10-27 00:30:05 -04:00
00f5e0613c
Stamina Damage Rework ( #12591 )
2019-10-27 00:23:22 -04:00
d6a6debf94
Traits framework ( #12548 )
2019-10-15 20:12:46 -04:00
45bb5241f0
Training Wheels Come Off ( #12587 )
2019-10-15 19:22:42 -04:00
660ec0e14d
Revert "Makes LINDA Aggressive"
2019-10-13 10:31:19 +02:00
63860a39b9
Makes LINDA Aggressive
2019-10-11 22:31:28 -04:00
fe403bef5c
Fixes APCs Not Being Hackable ( #12538 )
2019-10-09 09:58:36 -04:00
e884e76445
Updates Swarmers: Fixes Swarmer Megafauna ( #12516 )
2019-10-08 20:57:39 -04:00
93fa76bee0
Fixes Blood Types ( #12520 )
2019-10-07 23:15:54 -04:00
3ae71f7932
Merge pull request #12245 from Fox-McCloud/universal-damage
...
Universal Object Damage
2019-10-06 23:22:48 -04:00
67dc33ac3f
for-the-strength-from-which-he-gives-is-unerring
2019-10-05 02:08:11 -04:00
0e3a484c42
Fixes a bunch of things related to mindslaves ( #12491 )
2019-10-03 14:08:54 -04:00
82b6c821f6
Fixes toxic comp ( #12490 )
2019-10-03 09:20:00 -04:00
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -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
datlo