Commit Graph

5490 Commits

Author SHA1 Message Date
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
a9f8c70d62 Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364
[MIRROR] Changes stormtrooper ammo to 10g slugs
2018-03-17 23:54:33 +00:00
deathride58
d2926f3ba9 Merge pull request #5984 from Citadel-Station-13/upstream-merge-36470
[MIRROR] Fixes admins not working in certain cases
2018-03-17 23:54:16 +00:00
deathride58
df8fe921cc Merge pull request #5983 from Citadel-Station-13/upstream-merge-36478
[MIRROR] Gibs admin observers follow links
2018-03-17 23:53:57 +00:00
deathride58
50a05952d2 Merge pull request #5982 from Citadel-Station-13/upstream-merge-36475
[MIRROR] Fixed diseases getting negative points
2018-03-17 23:53:32 +00:00
deathride58
d30be811be Merge pull request #5979 from Citadel-Station-13/upstream-merge-36410
[MIRROR] Fixes dupe and runtime issues with Rod of Asclepius
2018-03-17 23:52:52 +00:00
deathride58
8b2aa30d6f Merge pull request #5977 from Citadel-Station-13/upstream-merge-36443
[MIRROR] Makes vanilla ice cream... require vanilla!
2018-03-17 23:51:37 +00:00
deathride58
238c8b24e2 Merge pull request #5974 from Citadel-Station-13/upstream-merge-36425
[MIRROR] Sec officers always like donuts
2018-03-17 23:50:30 +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
f5e49123e0 Merge pull request #5971 from Citadel-Station-13/upstream-merge-36409
[MIRROR] Fixed cameras holding up the arrival shuttle
2018-03-17 23:49:23 +00:00
deathride58
1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393
[MIRROR] Fixes bluespace radio potions
2018-03-17 23:49:02 +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
81Denton
f82456fd7f Changes stormtrooper ammo to 10g slugs (#36364)
* pulse slug instead of buckshot

* 10 gauge baby

* 10g name
2018-03-17 08:47:24 -05:00
Kyle Spier-Swenson
67d7cf3477 Fixes admins not working in certain cases (#36470)
* Fixes admins not working in certain cases

>admin doesn't get rank because of casing issue.

* put this in the wrong place
2018-03-17 08:26:37 -05:00
vuonojenmustaturska
aea919e4ec Merge pull request #36478 from MrStonedOne/patch-495
Gibs admin observers follow links
2018-03-17 08:25:25 -05:00
vuonojenmustaturska
f0cb5fd3d8 Merge pull request #36475 from Cruix/disease_fix
Fixed diseases getting negative points
2018-03-17 08:25:17 -05:00
TheDreamweaver
49a772b6b7 Fixes dupe and runtime issues with Rod of Asclepius (#36410)
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
2018-03-17 08:22:38 -05:00
vuonojenmustaturska
2d8258057b Merge pull request #36443 from ShizCalev/vanilla-icecream
Makes vanilla ice cream... require vanilla!
2018-03-17 08:21:17 -05:00
vuonojenmustaturska
75088e9b36 Merge pull request #36425 from Shadowlight213/donutsec
Sec officers always like donuts
2018-03-17 07:54:12 -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
11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle
Fixed cameras holding up the arrival shuttle
2018-03-17 07:53:44 -05:00
oranges
e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio
Fixes bluespace radio potions
2018-03-17 07:53:37 -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
CitadelStationBot
13709a7d34 [MIRROR] Simple xeno antagonist (#5961)
* Simple xeno antagonist

* Merge pull request #36397 from AnturK/xeno_antag

Simple xeno antagonist
2018-03-17 05:23:21 -05:00
deathride58
063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953)
* Makes xenobiology consoles rely on upgrades, spreads out xenobio console abilities into upgrade disks

* Update xenobio_camera.dm
2018-03-16 10:13:06 -07:00
deathride58
8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937)
* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
2018-03-16 03:27:30 -07:00
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955)
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
2018-03-15 20:50:10 -05:00
Poojawa
31d988344a maybe actually have mentors that aren't broke as shit (#5954) 2018-03-15 20:49:32 -05:00
CitadelStationBot
89f37cc8b7 [MIRROR] Fixes broken bot icons (#5952)
* Merge pull request #36379 from ShizCalev/bot-icon-fixes

Fixes broken bot icons

* Fixes broken bot icons
2018-03-15 07:20:24 -05:00
Poojawa
452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
CitadelStationBot
f00246ae79 [MIRROR] The names of Surgery Disks now match their type of surgery (#5950)
* The names of Surgery Disks now match their type of surgery

* Merge pull request #36407 from SailorDave/surgery-disk-names

The names of Surgery Disks now match their type of surgery
2018-03-14 16:58:36 -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
CitadelStationBot
dff9dabf06 [MIRROR] Fixes stopsounds properly (#5931)
* Fixes stopsounds properly (#36341)

* Revert "Merge pull request #36340 from vuonojenmustaturska/beelogreen"

This reverts commit 259838f38cfda32619e34cf41d57df4d45b75363, reversing
changes made to 111cd316a92f5f5840d96b1fc4bbe4cb7b1ce6fd.

* Fixes stopsounds properly

Also I forgot to actually block admins from bad protocols
it just showed them a message that it was blocked but didn't
block it

* Fixes stopsounds properly
2018-03-13 05:46:27 -05:00
CitadelStationBot
8dc9fcf816 [MIRROR] Fixes blindfolds blinding when not over your eyes (#5936)
* Fixes blindfolds blinding when not over your eyes (#36316)

* fixes blindfolds

* lets use ref instead then

* Fixes blindfolds blinding when not over your eyes
2018-03-13 05:45:53 -05:00
CitadelStationBot
31ffc89cbc [MIRROR] Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#5920)
* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#35987)

* Aurora caelus

* I saw that!

* fix?

* Weight increase for testmerge

* Update aurora_caelus.dm

* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights.
2018-03-12 13:13:00 -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
fd42d55993 [MIRROR] Fixes stopsounds (#5912)
* Fixes stopsounds

* Update playsound.dm
2018-03-12 07:58:48 -05:00
CitadelStationBot
544d7bcaf4 [MIRROR] Adds descriptions to all cargo orders! (#5917)
* Adds descriptions to all cargo orders!

* recompiles tgui
2018-03-12 07:39:38 -05:00
CitadelStationBot
71b3349c2d [MIRROR] Custom dockers must be greater than 10 tiles from map edge (#5922)
* Custom dockers must be greater than 10 tiles from map edge (#36306)

* Custom dockers must be greater than 10 tiles from map edge
2018-03-12 07:30:29 -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
7273e4f142 [MIRROR] Makes space cleaner more efficient, reduces spraybottle volume (#5914)
* Makes space cleaner more efficient, reduces spraybottle volume (#36228)

* Buffs janitor by making the space cleaner spray much more efficient

* bump volume to 100, shuffle some vars around

* Makes space cleaner more efficient, reduces spraybottle volume
2018-03-12 07:06:36 -05:00
CitadelStationBot
4f3115cfbe [MIRROR] Play Internet Sound sanity checks (#5918)
* Play Internet Sound sanity checks (#36080)

* Play Internet Sound sanity checks

Now checks if the content URL uses http(s) before playing

* HTML is not HTTP: renames regex

* Converted global regexes to procs that return them

* Revert "Converted global regexes to procs that return them"

This reverts commit 2eedbd6982b0c4de943a72c94f92f9d75001c06e.

* Play Internet Sound sanity checks
2018-03-12 07:04:43 -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
kevinz000
7efceb213e Update _production.dm (#5906) 2018-03-11 22:28:27 -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
18ace46af8 [MIRROR] Improves the shuttle error to include jump links and destination (#5900)
* Improves the shuttle error to include jump links and destination (#36305)

* Improves the shuttle error to include jump links and destination
2018-03-10 23:09:15 -06:00