Commit Graph

3577 Commits

Author SHA1 Message Date
CitadelStationBot
980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000)
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
2018-03-19 21:25:01 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
CitadelStationBot
b74454bf5c [MIRROR] Tweaks to ERT creation (#6021)
* inquisition ert tweak (#36511)

* Tweaks to ERT creation
2018-03-19 21:18:02 -05:00
CitadelStationBot
fcbc76a7a9 [MIRROR] Pacifists can now use mech drills on closets containing living beings (#6020)
* Pacifists can now use mech drills on closets containing living beings

* Removes no longer needed Mecha code relating to Pacifist use of drills. Also alters variables to be more consistent. (#36494)
2018-03-19 21:16:44 -05:00
CitadelStationBot
889ff6fa08 [MIRROR] circuit diagnostic status icon changes (#6019)
* circuit diagnostic status icon changes

* circuit diagnostic status icon changes (#36218)

* circuit diagnostic hud revisit

warning icon replaced with red versions of prefered icons, new icons added to the AR interface

* did this fix it?

* ok how about now

put all the new icons at the end of the file instead of at different places inside
2018-03-19 21:16:26 -05:00
CitadelStationBot
c8004a088e [MIRROR] Crayons and spraycans can no longer infinitely draw large graffiti (#6001)
* Crayons and spraycans can no longer infinitely draw large graffiti (#36412)

🆑 SailorDave
fix: Crayons and spraycans can no longer draw an unlimited amount of large graffiti regardless of uses left.
/🆑

Fixes https://github.com/tgstation/tgstation/issues/35833

The check_empty() at the top of the afterattack() was only checking if the can was empty, not if the amount of charges left was less than the spray amount. This is fixed.

* Crayons and spraycans can no longer infinitely draw large graffiti
2018-03-19 21:16:00 -05:00
CitadelStationBot
009f95db42 [MIRROR] Electronic assembly changes and additions (#6014)
* Electronic assembly changes and additions

* Electronic assembly changes and additions (#36394)

* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 21:11:23 -05:00
CitadelStationBot
1fd5de5bfe [MIRROR] Fixes stacks and material containers, fixes wet floors (#6008)
* Fixes stacks and material containers, fixes wet floors (#36497)

* Fixes stacks and material containers, fixes wet floors
2018-03-19 21:06:33 -05:00
deathride58
082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
[MIRROR] Clown Ops
2018-03-17 23:58:15 +00:00
deathride58
f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449
[MIRROR] Chem dispenser upgrade
2018-03-17 23:55:32 +00:00
deathride58
79db79f630 Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437
[MIRROR] Tesla coils and grounding rods actually shock buckled mobs.
2018-03-17 23:54:50 +00:00
deathride58
fa62612298 Merge pull request #5980 from Citadel-Station-13/upstream-merge-36438
[MIRROR] Fixes ghost portal teleportation
2018-03-17 23:53:10 +00:00
deathride58
fe801a89ac Merge pull request #5978 from Citadel-Station-13/upstream-merge-36401
[MIRROR] Mech drills behave more realistically
2018-03-17 23:51:56 +00:00
deathride58
b8d6bc53cf Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432
[MIRROR] Fixes brain damage json runtime
2018-03-17 23:50:10 +00:00
deathride58
c00c135ed4 Merge pull request #5969 from Citadel-Station-13/upstream-merge-36371
[MIRROR] Fixes false wall layering
2018-03-17 23:47:47 +00:00
deathride58
fc59e7d42f Merge pull request #5968 from Citadel-Station-13/upstream-merge-36079
[MIRROR] [S] Fixes tables being bluespace magnets
2018-03-17 23:47:29 +00:00
deathride58
b0f4508392 Merge pull request #5967 from Citadel-Station-13/upstream-merge-36130
[MIRROR] [READY] Refactors wet floors to a component
2018-03-17 23:47:15 +00:00
vuonojenmustaturska
aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00
RandomMarine
c1e897b298 Tesla coils and grounding rods actually shock buckled mobs. (#36437)
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
2018-03-17 08:49:38 -05:00
kevinz000
2dcaf50d07 Fixes ghost portal teleportation (#36438)
* Forced teleportation by portals

* Update portals.dm
2018-03-17 08:22:46 -05:00
vuonojenmustaturska
ac8c67e7b9 Merge pull request #36401 from XDTM/PierceTheHeavens
Mech drills behave more realistically
2018-03-17 08:22:30 -05:00
oranges
9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime
Fixes brain damage json runtime
2018-03-17 07:54:04 -05:00
oranges
9f561a6a65 Merge pull request #36371 from ShizCalev/false-wall-layer-fix
Fixes false wall layering
2018-03-17 07:53:28 -05:00
oranges
dd55ad6f88 Merge pull request #36079 from deathride58/nerfstheskylarlinemanexperience
[S] Fixes tables being bluespace magnets
2018-03-17 07:53:20 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 07:53:11 -05:00
AnturK
80e046572f Allows traitor AI's to take direct control of turrets. (#36154)
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
2018-03-17 07:53:01 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
Poojawa
ae2541f0fb Fixes missing href on borg sleepers (#5930)
* Fixes missing href

* Update dogborg_sleeper.dm
2018-03-15 04:44:03 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
2018-03-14 16:49:40 -05:00
LetterJay
3e95574d1e Merge pull request #5941 from Citadel-Station-13/upstream-merge-36346
[MIRROR] Makes touching (8)balls take less time
2018-03-14 10:42:13 -05:00
Dax Dupont
f132f6d703 Makes touching (8)balls take less time (#36346)
* Makes touching (8)balls take less time

* Lower it more because holy shit
2018-03-13 23:04:39 -05:00
kevinz000
0e4f0c0211 Exploit 2018-03-13 23:04:15 -05:00
CitadelStationBot
b24f4a7f1f [MIRROR] Allows medical sprays to be stored in medical belts and smartfridges (#5925)
* Medical sprays can now be added to medical belts and smartfridges (#36313)

* Allows medical sprays to be stored in medical belts and smartfridges
2018-03-12 13:12:18 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924)
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
2018-03-12 07:30:03 -05:00
CitadelStationBot
f9c1114ec1 [MIRROR] Pacifists can no longer cause harm using mech equipment (#5921)
* Pacifists can no longer cause harm using mech equipment (#36293)

* Fixes pacifists from firing mech weapons that cause harm

* Pacifists can still use mining equipment on non-living objects

* I'm a big ol dumbo that forgot how booleans are handled

* missed one

* forgot to save file before commit. Now all booleans are fixed

* CAPS

* Pacifists can't drill, clamp, or melee hit a closed locker or crate. prevents them from killing people inside them

* Pacifists now know if a container has a living being in it and will not drill, clamp, or melee it if it does.

* made change as requested by duncathan

* added an exception to the hydraulic clamp so that it can pick up containers with people in them.

* Pacifists can no longer cause harm using mech equipment
2018-03-12 07:08:34 -05:00
CitadelStationBot
4439fa7e98 [MIRROR] why doesn't nukeops actually check required_enemies (#5908)
* why doesn't nukeops actually check required_enemies (#36056)

* which idiot added pre_setup()

* was I drunk

* Update nuclear.dm

* why doesn't nukeops actually check required_enemies
2018-03-12 07:04:04 -05:00
CitadelStationBot
3ed7046cb6 [MIRROR] Lets belts hold additional job-specific items (#5909)
* Lets belts hold additional job-specific items (#36323)

* lets belts hold holoprojectors

* OH DUDE FOUR STRENGTH FOUR STAM LEATHER BELT AHH

* remote signaling device

* Lets belts hold additional job-specific items
2018-03-12 07:03:39 -05:00
CitadelStationBot
55ea11af46 [MIRROR] New RCD Sprites, ammo counters, and actual yellow flashing lights! (#5911)
* New RCD Sprites, ammo counters, and actual yellow flashing lights! (#36283)

* New RCD Sprites and spaghetti code!

* Adds new shrunken sprites!

Now with better fitting scale!

* New RCD Sprites, ammo counters, and actual yellow flashing lights!
2018-03-12 07:03:04 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
2018-03-12 07:01:54 -05:00
CitadelStationBot
6d1d678b3a [MIRROR] Machinery can now also be anchored on any /turf/open/indestructible, instead of only /turf/open/plating (#5915)
* Machines can now be anchored on /turf/open/indestructible (#36311)

* Machinery can now also be anchored on any /turf/open/indestructible, instead of only /turf/open/plating
2018-03-12 06:58:38 -05:00
deathride58
1c0b13ecfb [READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)
* part 1 - resist out of resting, move and interact with the world while resting, and stamina regen nerf

* makes beepsky check for stuns instead of knockdowns, adds message for getting up, makes gravity reduce standup time, and more

* sprinting, staminacrit, balance changes, and more

* adds stamina modifier to clickdelay, makes items deal stamina damage to the user when attacking, buffs resting stamina regen

* combat mode, ability to toggle right-click context menu on/off, basic combat mode QOL, lays groundwork for 2-handing any item

combat mode toggle sound is from Interbay.

* commits dme changes

* unarmed combat stamina, ability to right click in combat mode, balance changes

* tosses in the HUD icons for later-ish

* rolls back admin.txt

* lotsa UI stuff

* stamina checks, some balance stuff

* adds support for best ui, adds right click to flush disposals, removes aggressive grab pinning in favor of neckgrab chokeholding

* quick dogborg patch while i figure out what do do with them

* oops - fixes prefbreaking for screenshake

* trying to sprint from an elevated surface onto lower ground will now knock you down

* right click to pull fire alarm, lets you bully people by pulling chairs out form under them, makes attacking objects cost stamina

* makes accidents during slipping less likely to occur while combat mode is active, makes tripping off elevated surfaces cause accidents

* makes pumping shotguns cost a tiiiny bit of stamina

* makes eyestabbing and batoning cost stamina

* makes failing stamina checks error out properly, adds stamina check to shotgun pumping

* adds stamina check for chair pulling

* readds aggressive grab pinning

* fixes bug with being buckled preventing interaction

* adds recoveringstam check to incapacitated

* reduces stamina cost for attacking

* oh this too

* fixes bug where you can get stuck in recoveringstam if your stamina suddenly becomes 0 while you're in staminacrit

* makes monkey transformation inherit staminaloss

* adds the ability to wave or shake your fist at someone via right click

* grammar and span closing

* 99 annoying little bugs on the wall, 99 annoying little bugs. take one down, pass it around, 864 gamebreaking bugs on the wall

* more distant right-click emotes.

* buffs standing stamina regen a tiiiiiiny bit

* adds aiming down sights for guns, makes firing guns cause trace amounts of staminaloss

* crusher powercreep - gives crushers the ability to heal staminaloss

* item throwing buff

* adds 1:1 HUD layout

* hopefully fixes issue with recoveringstamcrit not updating

* giant hipfire nerf

* halves the effect of staminaloss on movement speed

* makes stamina recover faster in staminacrit, makes it easier to get disarmed out of combat mode

* get_weight(), movedelay health_deficiency tweaking, combat and resting checks for item attacking

* makes staminacrit automatically disable combat mode, it's now impossible to enter combat mode while in stamcrit

* adds stamina buffer, halves the time needed to stand up after resting, increases stam penalty for firing weapons, and more

* tweaks stamina buffer drain rate a little

* makes buffered staminaloss redirect stamina to the actual stamloss proc when empty, makes stamina buffer stat() more precise

* removes stamina modifier for clickdelays, makes stunbatons deal extra staminaloss

* makes electrodes deal a lil extra staminaloss

* drones cannot resist a rest, so now only carbons are forced to rest

* restricts aiming down sights to carbon mobs, adds stamina display to stat()

* makes gun accuracy and stamcosts more flexible, decreases base inaccuracy penalty, makes borgs immune to inaccuracy penalties

* nerfs inaccuracy penalties just a lil more, fixes blooddrunk miner eye depleting all your stamina

* getting used to tortoisegit

* readds temp dogborg buff

* stamina and stamina buffer HUD displays. Stamina sprite from hippiestation

* makes afterattack call properly again

* decreases stamina buffer regen time to 3 seconds

* Yknow what? decreases it to 2 seconds. That's 3 entire attacks worth of waiting

* makes stamina buffer influence movespeed a lil

* nerfs compiling errors

* tweaks the icons a little

* adds autostanding, adds delimiters to attempts to stand

* makes automatic standup attempts a little clearer

* rest button now toggles intent to rest, fixes perma rest

* oop - quick fixes

* Makes crushers ignore recoil stamina on lavaland, makes burstfiring weapons deal less staminaloss

* buffs highlander sword

* makes stamina have less of an impact on the health display

* fixes dogborgs shoving other borgs into infinite stuns

* You can no longer shoot over tables or shoot through windows while resting. Also buffs turrets
2018-03-11 13:32:44 -07:00
CitadelStationBot
e1823e1a40 [MIRROR] You can now non-violently place people on tables (#5891)
* You can now non-violently place people on tables (#36150)

* You can now non-violently place people on tables
2018-03-10 07:43:14 -06:00
CitadelStationBot
215ceaead3 [MIRROR] Adds welding goggles to engivend (#5890)
* Adds welding goggles to engivend (#36280)

* adds pill bottles/rcd/welding goggles

* atmosia is suffering

* Adds welding goggles to engivend
2018-03-10 07:38:54 -06:00
CitadelStationBot
4e9cff854d [MIRROR] Turrets can be set to shoot people without loyalty implants (#5888)
* Turrets can be set to shoot people without loyalty implants (#36226)

* adds feature to turrets allowing them to be toggled to shoot people who have not been loyalty implanted

* Fixed mistake left when changing variable names

* Turrets can be set to shoot people without loyalty implants
2018-03-10 07:36:00 -06:00
CitadelStationBot
a999863e5c [MIRROR] Fixes mirror var desync (#5883)
* Fixes mirror var desync (#36251)

* Fixes mirror var desync
2018-03-10 07:17:52 -06:00
deathride58
a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
deathride58
2c34acc034 Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-09 20:36:58 +00:00
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00:00
deathride58
bc5447d97b Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947
[MIRROR] [READY] NTNet airlocks
2018-03-09 19:24:35 +00:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00