Commit Graph

1709 Commits

Author SHA1 Message Date
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-25 14:50:29 -06:00
CitadelStationBot
58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634)
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
2018-02-24 09:35:48 -06:00
CitadelStationBot
913e94c128 [MIRROR] Black Fedora opens its inventory on-click like the Detective's Fedora (#5689)
* Black Fedora opens its inventory on-click like the Detective's Fedora (#35891)

* Black Fedora opens its inventory on-click like the Detective's Fedora

Instead of having to drag the sprite to your character to access its inventory, behaves the same as the Detective's Fedora opening its container on click. Considering some dets prefer the black variation for noir flavour rather than the brown standard one they just have to pass his flask from one hat to another.
I had either this in mind or creating a new black detective's fedora variant on the det's cabinet that also had the flask inside it.

The only other item affected by this, if I'm not mistaken, is the improper CentCom hat.

* Update internal.dm

Removed the <priority> line altogether to trim the code

* Black Fedora opens its inventory on-click like the Detective's Fedora
2018-02-24 07:02:57 -06:00
CitadelStationBot
b7015c379a [MIRROR] Cleans up some time stuff with DisplayTimeText (#5685)
* Cleans up some time stuff with DisplayTimeText

* Update hot_potato.dm
2018-02-24 07:02:45 -06:00
CitadelStationBot
03cc105e90 [MIRROR] removes inaccurate comment for item/proc/equipped (#5682)
* Merge pull request #35918 from JJRcop/patch-16

removes inaccurate comment for item/proc/equipped

* removes inaccurate comment for item/proc/equipped
2018-02-24 06:07:49 -06:00
CitadelStationBot
1f0a456085 [MIRROR] Reskinning objects now shows the possible appearances in chat (#5680)
* Reskinning now shows options in chat (#35910)

* Reskinning objects now shows the possible appearances in chat
2018-02-24 06:05:18 -06:00
LetterJay
6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775
[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
CitadelStationBot
4d42f68508 [MIRROR] Cleans up chem grenade copypasta'd code (#5675)
* Merge pull request #35913 from ShizCalev/chem_grenade

Cleans up chem grenade copypasta'd code

* Cleans up chem grenade copypasta'd code
2018-02-23 19:32:57 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
CitadelStationBot
4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673)
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
2018-02-23 17:42:24 -06:00
KomradeSpectre
951a580759 Fixes a dumbo runtime error in the analyzer's barometer function. OOF. (#35902)
* Fixes a dumbo runtime error in the Barometer function. OOF.

* Moves butchertime stuff into a proc.
2018-02-23 09:07:53 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
CitadelStationBot
80c2f30bd4 [MIRROR] Lets silicons disable morguetray alarms at a distance (#5669)
* Lets silicons disable morguetray alarms at range (#35855)

* Lets silicons disable morguetray alarms at a distance
2018-02-23 06:45:01 -06:00
CitadelStationBot
099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666)
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
2018-02-22 23:43:23 -06:00
CitadelStationBot
afa88c7b31 [MIRROR] Makes the morgue alt-click message clearer (#5665)
* Update morgue.dm (#35883)

* Makes the morgue alt-click message clearer
2018-02-22 23:42:43 -06:00
Buggy123
eaab8a687c tabling people on brass tables makes a clanging sound (#35876)
* tabling people on brass tables makes a sound

* fixes syntax

* more syntax fixes
2018-02-22 14:32:25 -06:00
CitadelStationBot
da690f3e07 [MIRROR] Adds five second cooldown to morgue tray beeps (#5652)
* Adds five second cooldown to morgue tray beeps (#35818)

* Adds five second cooldown to morgue tray beeps
2018-02-22 01:37:06 -06:00
CitadelStationBot
359a500e79 [MIRROR] New Donkpocket Box (#5641)
* New Donkpocket Box (#35835)

cl Jittai / ChuckTheSheep
imageadd: NT has stopped buying re-boxed storebrand Donkpockets and now stocks stations with real, genuine, tasty Donkpockets!
/cl

RIP: #35601
I was asked to throw together some icons for donk baggies, but had some fun making the box.

* New Donkpocket Box
2018-02-21 19:45:23 -06:00
CitadelStationBot
c10a4184ce [MIRROR] Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<< (#5642)
* Makes the morgue beep disable step clearer

cl
tweak: Nanotrasen has begun a campaign to inform their employees that you can alt-click to disable morgue tray beeping.
/cl

If its annoying you literally just alt-click to disable it. There's basically no situation where you would be able to hear it without being able to turn it off, except maybe the one morgue tray in the brig if you don't have access to the windoor (but just fucking ask sec to disable it).

* Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<<
2018-02-21 19:44:58 -06:00
CitadelStationBot
03dfbe7137 [MIRROR] Ports Barometers from Yogstation (#5647)
* Ports Barometers from Yogstation (#35730)

* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.

* Ports Barometers from Yogstation
2018-02-21 19:44:20 -06:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -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
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -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
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
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
Jordan Brown
c5f3aa7043 Merge pull request #35793 from DaedalusGame/naksu-pls
Fixes up foam and smoke code and comments again to atleast be correct
2018-02-19 22:07:44 -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
58af563131 [MIRROR] Redeems my sins. Defib mount fixes. (#5588)
* Redeems my sins. Defib mount fixes. (#35727)

* Never again

* stuff

* Bumps up the recharge.

* Redeems my sins. Defib mount fixes.
2018-02-19 10:22:21 -06:00
CitadelStationBot
5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
deathride58
c913ca262a Merge pull request #5567 from Citadel-Station-13/upstream-merge-35751
[MIRROR] Crew pinpointers now fit on medical belts
2018-02-18 23:30:07 +00:00
deathride58
96ab8e0161 Merge pull request #5565 from Citadel-Station-13/upstream-merge-35762
[MIRROR] fixes some stuff in flametrowers
2018-02-18 23:29:17 +00:00
deathride58
f35f20b0a1 Merge pull request #5563 from Citadel-Station-13/upstream-merge-35764
[MIRROR] RPED and crew pinpointer module upgrades for engi/medical borgs
2018-02-18 23:28:13 +00:00
deathride58
822394f807 Merge pull request #5561 from Citadel-Station-13/upstream-merge-35761
[MIRROR] improves radio code by fixing english
2018-02-18 23:27:27 +00:00
vuonojenmustaturska
6ed9b30987 Merge pull request #35751 from Xhuis/crewpointer
Crew pinpointers now fit on medical belts
2018-02-18 11:33:47 -06:00
Tlaltecuhtli
db8eb22b63 fixes some stuff in flametrowers (#35762)
* fixes some stuff in flametrowers

* updates admin.txt
2018-02-18 11:33:29 -06:00
vuonojenmustaturska
d4eab2acae borgmods 2018-02-18 11:33:12 -06:00
Tlaltecuhtli
2d9eb9202c improves radio code by fixing english
wow
2018-02-18 11:32:52 -06:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Zna12
1585de0687 [Ready to merge] Au-toy-lathe (#5534)
* Autoylathe Complete.

All the errors with the autoylathe should be fixed for now

* Toylathe Tweaking and plastic's initializing.

Well, this gets plastics halfway there. The toylathe now has 8 categories to choose from and some other sutff. It's all coming back.

* TOY LATHE NOW ACCEPTING PLASTIC

TOYLATHE IS WORKING AND RUNNING PROPERLY. SOME GUNS HAVE BEEN ADDED AND WILL NEED MORE TIME TO ADD MORE GUNS.

* Toy Datum construction.

Building some datums for the toys for the autoylathe to print.

* Toys toys toys

Adding toys to the list woo

* Autoylathe complete.

Holy shit it's fucking done.

* Fixes a duplicate id.

Also adds some shit to the hacked list.

* Okay this shit needs to stop

Rogue indentations? Nani?

* ugh

fuck

* Rogue indents

* Power issues

Fixes power scaling and the draining an APC

* Rogue File deletion.

Part of an early experiment that didn't work out.

* Some other tweaks and shit

Moves datums to the autoylathe designs and also fixes a dumb mistake I made.

* Clamps?

Added a clamp. Who knew?

* Shit.

Won't compile if it keeps looking for a file that doesn't exist

* Woops

Deleted a line not paying attention

* reworked initialize

I think I did this right.

* Revert "reworked initialize"

This reverts commit 649c156baebd64b6cd84e95f2f4c3cbd70dabce7.

* Odd variables that don't have any other references in the coding.

Why are these even here? Seriously.

* UNUSED VARIABLE?!

NANI?! Deleted. Don't need em.
2018-02-17 17:18:22 -08:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
deathride58
305849fba4 Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726
[MIRROR] Reflectors now reset the range of a projectile like before!
2018-02-17 20:44:06 +00:00
deathride58
5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707
[MIRROR] Adds rainbow slime clusterbangs
2018-02-17 19:31:20 +00:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668
[MIRROR] Quote the armor lists
2018-02-17 19:29:50 +00:00
Dax Dupont
f31df38f83 Reflectors now reset the range of a projectile like before! (#35726)
* Reflectors now reset the range of a projectile.

* how about dem apples
2018-02-17 13:18:08 -06:00
LetterJay
3c8fd612a0 Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722
[MIRROR] Fixes extremely thicc robots
2018-02-17 11:49:15 -06:00
LetterJay
fb7e1b1438 Merge pull request #5542 from Citadel-Station-13/upstream-merge-35735
[MIRROR] RESISTHOT species can put out fires with their hands
2018-02-17 11:47:35 -06:00
Dax Dupont
d368c42a98 Fixes extremely thicc robots (#35722)
* Fixes extremely fat robots

* grasp
2018-02-17 10:13:08 -06:00
vuonojenmustaturska
22fb75d2a6 Merge pull request #35735 from coiax/fire-proof-hands
RESISTHOT species can put out fires with their hands
2018-02-17 09:39:29 -06:00
vuonojenmustaturska
7214836012 Merge pull request #35734 from ShizCalev/path-cleanup
Cleans up unused /area paths
2018-02-17 09:39:20 -06:00