Commit Graph

5236 Commits

Author SHA1 Message Date
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841)
* uses time helpers, tweaks santa/shuttle loan times

* hourS
2018-02-21 11:38:26 -06:00
CitadelStationBot
845f21047d [MIRROR] You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names (#5615)
* You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names

* Update plastic_surgery.dm
2018-02-21 09:32:31 -06:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
CitadelStationBot
af2ae3d727 [MIRROR] Reverts intercept_user_move change for flightsuits (#5630)
* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
2018-02-21 09:28:53 -06:00
CitadelStationBot
fe8b463203 [MIRROR] Fixes the sensor corpse runtimes. (#5627)
* Merge pull request #35837 from AnturK/sensorbadcode

Fixes the sensor corpse runtimes.

* Fixes the sensor corpse runtimes.
2018-02-21 09:28:34 -06:00
CitadelStationBot
399b1c44fb [MIRROR] Revert the notify command not being admin only (#5629)
* Merge pull request #35825 from tgstation/Cyberboss-patch-1

Revert the notify command not being admin only

* Revert the notify command not being admin only
2018-02-21 09:28:12 -06:00
CitadelStationBot
83d1ad9e45 [MIRROR] Fixes jugg spell object damage (#5626)
* Merge pull request #35839 from AnturK/take-code-damage

Fixes jugg spell object damage

* Fixes jugg spell object damage
2018-02-21 09:27:50 -06:00
CitadelStationBot
54889864ab [MIRROR] Hopefully fixes gas miners (#5628)
* Merge pull request #35828 from tgstation/Cyberboss-patch-2

Hopefully fixes gas miners

* Hopefully fixes gas miners
2018-02-21 09:27:30 -06:00
Poojawa
8305efd5a1 Vore preference fix + Sounds respect wall barriers (#5623)
* various vore QoLs

* removed unused button, added the verb
2018-02-21 00:42:11 -06:00
deathride58
a89323182f Merge pull request #5622 from Citadel-Station-13/upstream-merge-35832
[MIRROR] Removes duplicate first death log
2018-02-21 06:31:33 +00:00
deathride58
172459b2d8 Merge pull request #5620 from Citadel-Station-13/upstream-merge-35823
[MIRROR] Fixes clowntears not grinding properly #35814
2018-02-21 06:31:11 +00:00
Jordie
b031f73ef4 Removes duplicate first death log (#35832)
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
2018-02-20 18:58:48 -06:00
Ordonis
3a1cfe9f59 Fixes #35814 (#35823)
Ree container changes ruined my neat solution now it's less neat
reeeeeeeeeeee
2018-02-20 17:28:12 -06:00
Ashe Higgs
08bc84d3db Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759)
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
2018-02-20 17:10:40 -06:00
deathride58
2ac71b3647 Merge pull request #5614 from Citadel-Station-13/upstream-merge-35838
[MIRROR] Fixes transit runtime.
2018-02-20 15:27:01 +00:00
deathride58
93a90664b7 Merge pull request #5613 from Citadel-Station-13/upstream-merge-35792
[MIRROR] Fixes multiserver mining formula
2018-02-20 15:26:49 +00:00
deathride58
d2e49dd52e Merge pull request #5612 from Citadel-Station-13/upstream-merge-35802
[MIRROR] Fixes ore stack sprites
2018-02-20 15:26:11 +00:00
deathride58
3779e384ec Merge pull request #5611 from Citadel-Station-13/upstream-merge-35507
[MIRROR] [READY]NTnet circuit fix
2018-02-20 15:25:59 +00:00
deathride58
79db3ba93d Merge pull request #5607 from Citadel-Station-13/upstream-merge-35578
[MIRROR] Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks
2018-02-20 15:24:26 +00:00
deathride58
5b7f37da25 Merge pull request #5606 from Citadel-Station-13/upstream-merge-35582
[MIRROR] The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round
2018-02-20 15:23:50 +00:00
deathride58
0fb4a03c69 Merge pull request #5605 from Citadel-Station-13/upstream-merge-35621
[MIRROR] Fixes noslip shoes not showing up in nuke ops uplink
2018-02-20 15:23:34 +00:00
deathride58
d1c08b145f Merge pull request #5604 from Citadel-Station-13/upstream-merge-35633
[MIRROR] Improves mining voucher choices and minebots
2018-02-20 15:23:21 +00:00
deathride58
2a36977048 Merge pull request #5603 from Citadel-Station-13/upstream-merge-35710
[MIRROR] Change-Projectile cleanup (and now you can be ANY* species)
2018-02-20 15:22:50 +00:00
deathride58
cd19411211 Merge pull request #5602 from Citadel-Station-13/upstream-merge-35737
[MIRROR] Italian mustache respects capital letters more
2018-02-20 15:22:33 +00:00
deathride58
a5d9fc4ddd Merge pull request #5601 from Citadel-Station-13/upstream-merge-35740
[MIRROR] Fixes mushroom bowls
2018-02-20 15:21:59 +00:00
deathride58
c9d36d7ec8 Merge pull request #5600 from Citadel-Station-13/upstream-merge-35780
[MIRROR] Fixed instant summon behavior with simple animals
2018-02-20 15:21:39 +00:00
deathride58
77f48a3ceb Merge pull request #5599 from Citadel-Station-13/upstream-merge-35782
[MIRROR] Fixed mutate not removing its effects when refunded
2018-02-20 15:21:16 +00:00
deathride58
940351b8de Merge pull request #5597 from Citadel-Station-13/upstream-merge-35804
[MIRROR] Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
2018-02-20 15:20:28 +00:00
vuonojenmustaturska
4a65d8feeb Merge pull request #35838 from AnturK/imdumb
Fixes transit runtime.
2018-02-20 04:11:15 -06:00
Jordan Brown
c36f144d9e Merge pull request #35792 from DaedalusGame/bitconnect
Fixes multiserver mining formula
2018-02-19 22:09:55 -06:00
vuonojenmustaturska
507a481a40 Fixes ore stack sprites (#35802)
* Fixes ore sprites

* Update ores_coins.dm
2018-02-19 22:09:46 -06:00
oranges
950d18c8db Merge pull request #35507 from arsserpentarium/ntnetfix
[READY]NTnet circuit fix
2018-02-19 22:09:35 -06:00
Ashe Higgs
1fe801e155 Adds a debug circuitry printer, along with some assorted circuit fixes and tweaks (#35578)
* Some more circuitry foolin'

* Fixes blood draw not working
2018-02-19 22:09:01 -06:00
Ashe Higgs
7496feb40f The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round (#35582)
* Adds a "first death" feature to the roundend

* no clogging up with antag-rollers

* fixes red text color

* Maintainer review (finally, sorry)
2018-02-19 22:08:52 -06:00
YPOQ
87d8be5287 Fixes noslip shoes not showing up in nuke ops uplink (#35621)
* Fixes noslip shoes not showing up for nuke ops

* Updates other references to GLOB.uplink_items

* Removes unnecessary SSticker checks
2018-02-19 22:08:44 -06:00
Joan Lung
8e592f77a2 Improves mining voucher choices and minebots (#35633)
cl Joan
tweak: The crusher kit now includes an advanced mining scanner.
tweak: The resonator kit now includes webbing and a small extinguisher.
tweak: The minebot kit now includes a minebot passthrough kinetic accelerator module, which will cause kinetic accelerator shots to pass through minebots. The welding goggles have been replaced with a welding helmet, allowing you to wear mesons and still be able to repair the minebot without eye damage.
feature: You can now install kinetic accelerator modkits on minebots. Some exceptions may apply. Crowbar to remove modkits.
balance: Minebots now shoot 33% faster by default(3 seconds to 2). The minebot cooldown upgrade still produces a fire rate of 1 second.
balance: Minebots are now slightly less likely to sit in melee like idiots, and are now healed for 15 instead of 10 when welded.
balance: Sentient minebots are penalized; they cannot have armor and melee upgrades installed, and making them sentient will override those upgrades if they were installed. In addition, they move very slightly slower and have their kinetic accelerator's cooldown increased by 1 second.
/cl

the basic scanner sucks ass and nobody wants to use it, it's actually hilarious
also in those stats: minebot picked a mere 6 more times than the conscription kit, because it's an idiot drone, easy to accidentally hit, and did I mention how much it likes going into melee?

tbh it's quite possible the extra buffs aren't needed, just the passthrough module, but it's better to go a little too far rather than not far enough.
2018-02-19 22:08:34 -06:00
ExcessiveUseOfCobblestone
a627418e78 Change-Projectile cleanup (and now you can be ANY* species) (#35710)
cl Cobby
experiment: Being hit by a bolt of change now opens up previously-barred races. Hopefully you don't roll plasmaman!
/cl

    If the subtype for the species was added hehe

I was going to brag about how there wasn't any balance change but this does allow for more of the "fun" races within humans to come up.

Webbit so probably some dumb typo somewhere
2018-02-19 22:08:26 -06:00
oranges
91a404fca7 Merge pull request #35737 from coiax/better-italian
Italian mustache respects capital letters more
2018-02-19 22:08:17 -06:00
fludd12
0d03e90e9f Fixes mushroom bowls (#35740)
* Fixes mushroom bowls

Made the mushroom bowl a subtype of the normal bowl, and deleted a
duplicate definition.

Also, adds custom soup and salad support for the mushroom bowls.

Fixes #32471

* Remove a dangling return
2018-02-19 22:08:09 -06:00
Cruix
558b87ce65 Fixed instant summon behavior with simple animals (#35780)
Removed hand slots from lots of things that should not have them
2018-02-19 22:08:01 -06:00
oranges
07fc2d1f5e Merge pull request #35782 from Cruix/mutate_off
Fixed mutate not removing its effects when refunded
2018-02-19 22:07:52 -06:00
Jordan Brown
ff0f8189c5 Merge pull request #35804 from DaedalusGame/ghost-rolling
Fixes ghost role spawners still showing up in the spawner menu even if they're deleted
2018-02-19 22:07:34 -06:00
Trevor Serpas
108f1c85ff Adds circutry to diagnostic hud, adds action flags to circuits (#35718)
cl
add: Circuits integrity, charge, and overall circuit composition is displayed on diagnostic huds. If the assembly has dangerous circuits then the status icon will display exclamation points, if the assembly can communicate with something far away a wifi icon will appear next to the status icon, and if the circuit can not operate the status icon will display an 'X'.
add: AR interface circuit which can modify the status icon if it is not displaying the exclamation points or the 'X'.
tweak: Locomotive circuits can no longer be added to assemblies that can't use them.
spellcheck: Fixed a typo in the grenade primer description.
code: Added flags to circuits that help group subsets of circuits and regulate them.
/cl

The diagnostic hud addition is meant to allow more counter play to circuits by seeing the assemblies's healths and how dangerous they are. The flags are a useful addition to the code because players shouldn't be able to put circuits in assemblies if the assembly can't use that circuit (this can also be used later for other assemblies which could use unique circuits).

The following circuits are flagged as dangerous:
weapon firing mechanism
grenade primer
thrower

The following circuits are flagged as long range:
NTNet networking circuit
integrated signaler
video camera circuit

possible AR interface displays:
default
alert
move
2018-02-19 22:07:16 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
CitadelStationBot
7ef05e33ad [MIRROR] Mime's Bane recipe (#5592)
* Mime's Bane recipe (#35570)

* Makes Mimes's Bane use the new EMOTEMUTE trait

It randomly occured to me that I should do this.

Mime's Bane is currently a reagent currently only used in cloning pods
to stop growing clones from gasping from crit/lack of air (since they're
in a pure nitrogen environment).

* 2 Mime's Bane = 1 Mute Toxin + 1 Nothing

* Mutetoxin + nothing + radium

* Mime's Bane recipe
2018-02-19 10:23:20 -06:00
CitadelStationBot
74009632a2 [MIRROR] Fixed overlapping timestop behavior (#5591)
* Merge pull request #35784 from Cruix/timestop_overlap

Fixed overlapping timestop behavior

* Fixed overlapping timestop behavior
2018-02-19 10:22:59 -06:00
CitadelStationBot
177b808794 [MIRROR] Adds a space on check antag between name and role (#5589)
* Merge pull request #35683 from lzimann/checka

Adds a space on check antag between name and role

* Adds a space on check antag between name and role
2018-02-19 10:22:47 -06:00
CitadelStationBot
6e28b456ba [MIRROR] Deletes a redundant double proc definition in paper bins (#5586)
* Merge pull request #35797 from DaedalusGame/freon-is-back-baybee

Deletes a redundant double proc definition in paper bins

* Deletes a redundant double proc definition in paper bins
2018-02-19 10:21:47 -06:00
CitadelStationBot
5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
Poojawa
97f69d6b05 Stop the fucking posibrain pinging, christ (#5584) 2018-02-19 01:04:15 -06:00