Commit Graph

415 Commits

Author SHA1 Message Date
Fox McCloud 23e594b246 Merge pull request #13773 from Gatchapod/hydro-SR-fix
Fixes SR spawning mobs in nullspace instead of hydroponics trays
2020-07-05 14:38:32 -04:00
Gatchapod 5cfc0e1e85 this is objectively a superior way of doing it 2020-07-05 20:01:06 +02:00
Gatchapod 4fd4a949aa no more nullspace tomatoes and trees 2020-07-05 15:06:04 +02:00
Kyep 547d76fb4b Cyborg Improvements (#13056)
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-06-28 14:16:14 -06:00
SteelSlayer 74d0e6523b Fixes welders blinding you when you repair robo-limbs and cyborgs (#12988)
* Fixes welders blinding you while repairing your own robo-limbs

* gives tool_start_check() a target argument

* flash be gone

* CRLF to LF

* adds trailing newlines because travis wants them I guess

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-06-26 01:18:13 -06:00
Fox McCloud b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
SteelSlayer db4d44901d on cross removal 2020-06-24 11:33:31 -05:00
SteelSlayer 7088de6bab slippery component 2020-06-06 15:35:12 -05:00
SteelSlayer c2813a73e2 Removes the Freeze Mech verb, and bundles its functionality into the Freeze verb (#12827)
* Makes the Freeze Mech admin verb work properly

* freeze overhaul, axe Freeze Mech verb

* define freeze on the atom/movable level

* CRLF to LF

* rebase and touch ups

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2020-05-21 21:41:00 -06:00
Pidgey 43f664f4a7 Diona nymphs can eat veggies (#12423)
* Diona Nymphs can now consume vegetables. It takes 2 seconds to do so, and they gain nutrition based on how much plant matter and/or nutriment is present. This tends to be a slightly slower way to grow than eating weeds (unless specialized plants are provided for the purpose, like high potency pumpkins) but provides an option to nymphs that have nothing but earthsblood trays around.

* Changed the spacing a bit.

* Changing some minor things in line with provided code reviews.

* Hopefully this is an improvement.

* Requested minor changes

* Swapped type check with isnymph(). I didn't even know these defines existed.
2020-05-21 20:21:42 -06:00
Deckard Cain f97bc5876b fixed apples not distilling in fermenting barrels
apples previously distilled into hcider, which was an icon state and not actually a reagent proper. this resulted in apples simply not fermenting into anything when processed in a fermenting barrel. (if the apples contained reagents such as plant_matter or sugar or whatever else botanists put in their genes, then these would of course be transferred to the barrel normally.)
2020-05-14 16:53:41 -04:00
AffectedArc07 928a8f0e04 Makes the code pass dreamchecker (#13161)
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
2020-04-11 15:59:16 -06:00
AffectedArc07 ded391b325 Bonfire Logs (#13268)
* Bonfire Logs

* Farie Suggestion

* Adds craft logging

* Log changes
2020-04-11 15:47:45 -06:00
Crazy Lemon f555d49b9a Removes all usages of a certain word in a certain sense (#13277) 2020-04-09 13:43:10 -04:00
AffectedArc07 a36636ed0c Speedpurge Bad Comments 2020-04-09 13:42:56 +01:00
AffectedArc07 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
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 5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
variableundefined edebec5194 Merge pull request #13021 from Fox-McCloud/add-cbd
Adds CBD
2020-03-08 21:46:20 -04:00
variableundefined 5f6e9f8cb2 Merge pull request #13007 from TheSardele/log-change
Adds a log for admins
2020-03-08 03:43:52 -04:00
AffectedArc07 a1fa46f5a8 Merge branch 'master' into var/const-to-define 2020-03-03 22:44:07 +00:00
Mitchs98 d04c11eb60 Le Bomba (#13052) 2020-03-01 13:18:01 -07:00
Fox McCloud c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
AffectedArc07 8671439f11 Merge branch 'master' into var/const-to-define 2020-02-22 16:30:01 +00:00
TheSardele 7af1b2ae1e Use helpers 2020-02-20 11:42:59 +01:00
TheSardele 3635b42335 Adds a log 2020-02-19 23:58:46 +01: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
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00: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
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 a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -04:00
Fox McCloud a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -04: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
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud 3f143c071c Fixes Seed Vault Gene Modder (#12409) 2019-09-24 15:23:54 -07:00
AzuleUtama 2855248818 Fixes durathread mutating, reorganizes seed vendor (#12401) 2019-09-24 15:19:45 -07:00
Fox McCloud 86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
Fox McCloud 62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
MarsM0nd 7c2abe9cdf Fixes nettle pickup (#12371) 2019-09-21 12:18:36 -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 aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 91d08fb1f6 garlic reagent 2019-09-11 06:33:03 -04:00
Fox McCloud 5e4521bc82 Hydroponics Update: Growable Ash Flora 2019-09-11 05:52:57 -04:00
Fox McCloud a81b52f834 Merge remote-tracking branch 'upstream/master' into ashwalker-tweak 2019-09-03 01:16:36 -04:00