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
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
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
farie82
60d58d5b37
Fixes 4 runtimes ( #12974 )
...
* Fixes proc: /datum/money_account/proc/charge
* Fixes necropolis_chests.dm,214 proc: /obj/item/rod_of_asclepius/attack_self
* fixes: give.dm,25 proc: /mob/living/carbon/verb/give
* Fixes: game.dm,495 proc: /proc/pollCandidates
2020-02-14 20:22:10 -05: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
Mars
f2f7ec956a
Orderable conscription kit only without ID
2019-10-31 15:43:35 +01:00
Fox McCloud
209379d22a
Nerfs Glass Armor ( #12544 )
2019-10-27 00:19:13 -04:00
Fox McCloud
d6a6debf94
Traits framework ( #12548 )
2019-10-15 20:12:46 -04:00
Fox McCloud
45bb5241f0
Training Wheels Come Off ( #12587 )
2019-10-15 19:22:42 -04:00
Ty-Omaha
6fb42e42f2
heirophant club attack logs ( #12582 )
2019-10-13 23:23:11 -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
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
variableundefined
71803787a8
Merge pull request #12415 from Kyep/nerf_babel
2019-10-04 14:49:26 -04:00
Fox McCloud
20c4cf0a08
for-if-I-stand-I-stand-by-his-will-alone
2019-10-03 19:52:03 -04:00
Fox McCloud
d29be05f74
the-figment-that-was-is-now-gone
2019-10-01 19:08:15 -04:00
Fox McCloud
a469d0fcf2
for-God-has-redeemed-us-all
2019-09-30 16:49:15 -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
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
Fox McCloud
360c29008e
Minor Vehicle Refactor and Balance
2019-09-27 19:59:38 -04:00
Mars
8b87bd529c
Slight refactor of conscription kit
2019-09-27 17:44:06 +02:00
farie82
0e8ddb2afe
Refactors the examine proc to return a list of strings ( #12280 )
2019-09-25 22:05:01 -07:00
Kyep
4d35318766
requests
2019-09-25 16:15:21 -07:00
Kyep
2524208e83
Nerfs Book of Babel
2019-09-25 01:28:46 -07:00
Kyep
e7530e8507
Fixes hierophant club and warp cube ignoring area/tele_proof ( #12360 )
2019-09-24 15:16:04 -07:00
Kyep
a44718f5e5
Fixes incorrect names of syndie/antag coins ( #12362 )
2019-09-24 15:11:29 -07: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
Fox McCloud
5810d28571
Refactors Simple Mob Creation: Adjusts Which Mobs are Available ( #12325 )
2019-09-17 16:06:43 -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
Fox McCloud
1b1bd00c06
Updates Status Effects: Fixes Blood Drunk Status Effect, Buffs Regenerative Core ( #12320 )
2019-09-17 07:56:50 -04:00
Fox McCloud
d015c0c2b2
even-still-though-time-itself-be-shattered
2019-09-16 01:35:25 -04:00
Fox McCloud
af92373d33
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
variableundefined
f6fe4a1520
Merge pull request #12291 from Fox-McCloud/hierophant-update
...
Hierophant Update
2019-09-14 22:31:38 -04:00
Fox McCloud
1bfb442d40
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-14 21:15:31 -04:00
Fox McCloud
bdcdfc04f0
Hierophant Update
2019-09-13 19:35:41 -04:00
AzuleUtama
30547d2bae
Fixes 'Name' design in R&D console
2019-09-13 20:12:39 +01:00
Dave
454ea46587
Let's be honest, the miners are going to die either way
2019-09-13 01:08:55 -04:00
variableundefined
e571d30f74
Merge pull request #12266 from Fox-McCloud/hydro-update
...
Hydroponics Update: Growable Ash Flora
2019-09-12 22:40:01 -04:00
variableundefined
db211cfc54
Deconflict
2019-09-11 23:00:13 -04:00
Fox McCloud
5e4521bc82
Hydroponics Update: Growable Ash Flora
2019-09-11 05:52:57 -04:00
variableundefined
18b270cb7e
Remove the structure/chair/wood/normal subtype, moving all properties to its parent.
2019-09-11 00:28:27 -04:00
Fox McCloud
5943ad2902
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-10 07:09:30 -04:00
