Commit Graph

685 Commits

Author SHA1 Message Date
AffectedArc07
0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge
Purges Rigs
2020-08-09 18:21:39 +01:00
AffectedArc07
debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
Fox McCloud
50eba96666 Merge pull request #13832 from dearmochi/fix-syringe-gun-clip-size
Fix bug that allows loading an additional syringe to syringe guns
2020-07-14 09:26:24 -04:00
mochi
273a3e7b23 Fix syringe gun allowing one syringe more than normal 2020-07-14 09:13:42 +02:00
Fox McCloud
5cb34328c6 Merge pull request #13753 from SteelSlayer/lwap-update
Gives the L.W.A.P in-hand sprites; Some tweaks to the gun, and the "toggle scope" action button
2020-07-13 15:33:54 -04:00
mochi
4d4a756487 Fix syringe gun chambering weirdness 2020-07-10 13:11:22 +02:00
Fox McCloud
07597b9480 Merge pull request #13326 from AzuleUtama/slipStaffNerf
Lowers max charges and recharge time for Staff of Slipping
2020-07-08 19:20:28 -04:00
SteelSlayer
e58b11356d L.W.A.P this bitch into shape 2020-07-01 20:36:46 -05:00
Fox McCloud
c4143aedf0 Purges Rigs 2020-07-01 13:09:15 -04:00
Fox McCloud
e438ff4d36 Makes Mobs Lazier and Removes Hard References (#13693)
* Makes Mobs Lazier and Removes Hard References

* fluff
2020-06-30 17:52:28 -06: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
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
Fox McCloud
c20487a876 Merge pull request #13344 from Daylight2/door-stuff
Fixes #13243 - Makes wands no longer work in den
2020-05-05 04:05:26 -04:00
SteelSlayer
faeb575c14 forcemove 2020-05-03 20:54:59 -05:00
SteelSlayer
e79ca9fcac crossbow cell fix 2020-05-02 22:18:30 -05:00
Daylight
a44c9b57e7 Probablly should remove this too. 2020-05-02 15:51:14 +03:00
Daylight
83ab08bae9 Makes no_den_usage only on door wand again 2020-05-02 15:46:59 +03:00
Daylight
ac0c227b21 Uses TRUE instead of 1 2020-04-28 15:52:43 +03:00
Daylight
8f28b1eef2 Moves den usage to parent, all wands no longer work on den 2020-04-28 15:26:27 +03:00
Daylight
027036ef46 Revert "Revert "makes wand of door creation not work in den""
This reverts commit 7eac9c92be.
2020-04-28 02:13:04 +03:00
Daylight
7eac9c92be Revert "makes wand of door creation not work in den"
This reverts commit 91cf99f20e.
2020-04-28 00:30:18 +03:00
Daylight
91cf99f20e makes wand of door creation not work in den 2020-04-28 00:21:57 +03:00
AzuleUtama
7f2c01be84 Lowers staff stats 2020-04-22 22:46:12 +01:00
farie82
1b5641d3fe Merge branch 'master' into runtime-fix-2 2020-04-19 00:01:37 +02: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
AzuleUtama
a6330d5977 Added sprite and updated compact rifle icon (#12825) 2020-04-10 22:39:18 -06:00
farie82
4d4da7653d Makes the KA and energy guns use Initialize instead of New fixing the KA runtime (#13227)
* Makes the KA and energy guns use Initialize instead of New

* Fixes
2020-04-09 22:58:10 -06:00
farie82
ebded4f39e Logging prio changes (#13174) 2020-03-22 20:47:51 -06:00
farie82
9338b7a0ed Merge branch 'master' into runtime-fix-2 2020-03-22 08:36:40 +01:00
farie82
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
joep van der velden
07ffa0f60a Merge branch 'ParadiseSS13/master' into runtime-fix-2 2020-03-18 16:59:49 +01: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
Kyep
49bdfbf3f0 Fixes #13070 - cyborg energy guns breaking (#13071)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-03-05 22:35:02 -07:00
Kyep
bd85adb11c Fixes cyborg energy weapons costing twice as much as intended 2020-03-04 02:25:36 -08:00
Citinited
40521a643b detective revolver can now screwdriver_act 2020-02-21 23:57:33 +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
joep van der velden
5f293e0f44 Fixed a few funtimes 2020-01-30 23:28:59 +01:00
Evankhell561
af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -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
Fox McCloud
5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -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
73f530d843 Merge pull request #12421 from SteelSlayer/mining-borg-gps-fix
Mining borg QoL update and fix
2019-10-02 20:46:48 -04:00
SteelSlayer
c4933d76d5 what I get for trying to code at 2 am 2019-10-02 02:10:46 -05:00
SteelSlayer
a5e1b75aee oop, want this in the KA file not energy 2019-10-02 02:03:26 -05:00
SteelSlayer
b895864a1a robocharge overload 2019-10-02 02:00:50 -05: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
SteelSlayer
719aa65fa6 less hacky code update 2019-09-27 22:49:58 -05:00
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
SteelSlayer
c91707b9e5 no more borg KA spam
logic fix

logic fix

logic fix
2019-09-25 20:56:12 -05:00