Commit Graph

14988 Commits

Author SHA1 Message Date
loginsandylogout 53454d8ab9 d 2018-04-04 13:13:30 -05:00
loginsandylogout 3b4b557687 a 2018-04-04 13:12:52 -05:00
loginsandylogout d2cf2e8018 HMMM 2018-04-04 13:12:27 -05:00
loginsandylogout d845bf84a9 k 2018-04-04 12:56:34 -05:00
loginsandylogout a4e3b19891 maybe 2018-04-04 12:55:52 -05:00
loginsandylogout 417fa9e264 yes 2018-04-04 12:52:40 -05:00
loginsandylogout cee51cd79d should fix conflicts 2018-04-04 12:50:02 -05:00
loginsandylogout 2d038f3f94 gay 2018-04-01 18:31:26 -05:00
loginsandylogout a4d949816b increased glove csost 2018-03-30 13:38:07 -05:00
loginsandylogout 3eecb782b9 COUGH COUGH SMOKING COUGH 2018-03-22 23:57:25 -05:00
loginsandylogout 8d74f7a791 moustache 2018-03-22 23:54:24 -05:00
loginsandylogout 798b10d28b more gloves 2018-03-22 23:48:58 -05:00
loginsandylogout e7ffc961bc polychromic nerds 2018-03-22 23:39:11 -05:00
loginsandylogout 6f87d24289 DELETED FROM HERE 2018-03-22 23:29:17 -05:00
loginsandylogout fe39a5a550 MOVED TO HERE 2018-03-22 23:28:33 -05:00
loginsandylogout 57e99aa025 wait 2018-03-22 14:39:09 -05:00
loginsandylogout d4a4c7b0bf Update uniform.dm 2018-03-22 14:28:20 -05:00
loginsandylogout 5c5e336919 THOTS 2018-03-22 14:27:49 -05:00
loginsandylogout 5eee3d6ada added 2018-03-22 13:22:24 -05:00
loginsandylogout 2bd4aa98ed y 2018-03-22 13:10:23 -05:00
deathride58 476d4ff075 Merge pull request #6053 from Citadel-Station-13/upstream-merge-36539
[MIRROR] Removes toolarm prefix from toolarm surgery tools.
2018-03-21 21:45:09 +00:00
deathride58 def113531c Merge pull request #6052 from Citadel-Station-13/upstream-merge-36565
[MIRROR] Being happy no longer makes you obese.
2018-03-21 21:44:49 +00:00
CitadelStationBot 665754992d Removes toolarm prefix from toolarm surgery tools. 2018-03-21 16:14:35 -05:00
Tlaltecuhtli 3fab4a3b41 fixes #36538 (#36539)
Removes toolarm prefix from toolarm surgery tools.
2018-03-21 16:14:35 -05:00
CitadelStationBot 848ec04d38 [MIRROR] Sets the default preload_rsc to 2 (#6051)
* Sets the default preload_rsc to 2 (#36556)

This was supposed to be 1 or 2 (2 preloads uploaded resources) in the repo and set to 0 in [`server_side_modifications.dm`](https://tgstation13.org/parsed-logs/basil/server_side_modifications.dm) but i messed that up when i switched it from a test merging pr to something mergable.

* Sets the default preload_rsc to 2
2018-03-21 15:55:47 -05:00
CitadelStationBot b45d732a7d Being happy no longer makes you obese. 2018-03-21 15:35:33 -05:00
Qustinnus 79911d330a Being happy no longer makes you obese. (#36565)
* D O U B L E N E G A T I V E

* jesus
2018-03-21 15:35:33 -05:00
Poojawa b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
deathride58 c14b00ad80 Merge pull request #6033 from Poojawa/bluespace-bags-are-a-mistake
Fixes occupied bluespace bodybags from being put in the analyzer
2018-03-21 19:31:05 +00:00
deathride58 06ca6cfc9d Merge pull request #6040 from Citadel-Station-13/upstream-merge-36537
[MIRROR] Adds lights to the bridge on Omega
2018-03-21 19:30:15 +00:00
deathride58 0a331a26ee Merge pull request #5994 from Poojawa/beepboop
Adds IPCs refractors preferences
2018-03-21 19:20:43 +00:00
CitadelStationBot 4403ccf908 [MIRROR] Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#6038)
* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#36549)

* Add Fringe Weaver, Sugar Rush, Crevice Spike from Va-11 Hall-A

* Rebalance crevice spike damage

* Crevice Spike cleanup and sugar-y Sugar Rush

* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A
2018-03-21 14:00:54 -05:00
CitadelStationBot 2fbdfd1856 [MIRROR] Atmos unary devices can now be analyzed (#6037)
* Atmos unary devices can now be analyzed (#36485)

tweak: Unary devices can now be analyzed using gas scanners. This means stuff like vents, scrubbers, cryo tubes, or heaters/freezers.


fixes #36448

this means stuff like cryo, vents, scrubbers, heat exchangers, heaters/freezers, injectors, those big pressure tanks etc. can now be analyzed by gas analyzers/PDA gas scanners

* Atmos unary devices can now be analyzed
2018-03-21 12:58:24 -05:00
CitadelStationBot 99487a6bbb [MIRROR] April Fools Day replaces the overflow role with Clowns (#6041)
* April Fools Day replaces the overflow role with Clowns (#36533)

* Refactors overflow job assignment

* Fixes job selection

* April Fools Day replaces the overflow role with Clowns
2018-03-21 12:57:30 -05:00
CitadelStationBot 4ad2b2975a [MIRROR] Fixes some more trauma bugs (#6039)
* Fixes some more trauma bugs (#36487)

* fixes some more trauma bugs

* Update brain_trauma.dm

* Update brain_item.dm

* Fixes some more trauma bugs
2018-03-21 12:50:22 -05:00
CitadelStationBot 962311ff0d [MIRROR] Preload vox sounds when preload_rsc is disabled (#6042)
* Merge pull request #36557 from MrStonedOne/patch-498

Preload vox sounds when preload_rsc is disabled

* Preload vox sounds when preload_rsc is disabled
2018-03-21 12:49:48 -05:00
LetterJay 5433b320bf Merge pull request #6036 from Citadel-Station-13/cloak
Donator cloak
2018-03-21 07:59:07 -05:00
CitadelStationBot d95d734b14 Adds lights to the bridge on Omega 2018-03-21 01:04:05 -05:00
ShizCalev b569465705 Adds lights to the bridge on Omega (#36537) 2018-03-21 01:04:05 -05:00
LetterJay 613d54ad4e Update __donator.dm 2018-03-21 00:36:40 -05:00
LetterJay 8797bdace1 donator cloak thing, going to bed 2018-03-21 00:29:11 -05:00
Poojawa 8377bdf9a8 fixes some screen issues 2018-03-20 23:53:55 -05:00
Poojawa f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
Poojawa b80e7cded9 fixes #5996 2018-03-20 19:18:33 -05:00
Michiyamenotehifunana 61fde978e1 Tennis Balls! (and donator stuff) (#5962)
* Donator rainbow stuff and balls!

* Updates code and adds izzy's donator thing

* Adds right click memes!
2018-03-20 19:11:34 -05:00
Poojawa 2bb09bef5f Adds additional screen 'faces', allows switching of screens in game
also puts jelly people in with the jelly people file.
2018-03-20 13:53:52 -05:00
deathride58 0d4e7f73f4 Merge pull request #6031 from Citadel-Station-13/upstream-merge-36466
[MIRROR] Unit test to make sure all subsystems which initialize call parent
2018-03-20 15:56:27 +00:00
deathride58 3aca9ea2af Merge pull request #6030 from Citadel-Station-13/upstream-merge-36523
[MIRROR] Fix N2 filter in deep storage ruin
2018-03-20 15:54:29 +00:00
Poojawa af82e1109f slight tweaks, revert job controller changes, penor layering tweaked 2018-03-20 10:41:36 -05:00
deathride58 9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00