Commit Graph

3261 Commits

Author SHA1 Message Date
CitadelStationBot
92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291)
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
2018-02-05 05:36:09 -06:00
CitadelStationBot
2ab7a45cb9 If the person inside a morgue tray is clonable, they now beep. Loudly. (#5302) 2018-02-05 05:35:44 -06:00
CitadelStationBot
98d18ee7e3 [MIRROR] Removes tripai landmark (#5280)
* Removes tripai landmark

* Update landmarks.dm
2018-02-05 04:44:31 -06:00
CitadelStationBot
e16db54c67 [MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic (#5297)
* Bartender Drink Sliding: Intrinsic to Extrinsic

* Update packs.dm
2018-02-05 04:42:13 -06:00
CitadelStationBot
5c16755e58 [MIRROR] Fixes Vape Pen (e-cig) reagent spam (#5296)
* Fixes Vape Pen (e-cig) reagent spam

* Update cigs_lighters.dm
2018-02-05 04:33:36 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
CitadelStationBot
d4c270fe4a [MIRROR] [READY] Fixes de-initialization of cleanables-ash (#5295)
* [READY] Fixes de-initialization of cleanables-ash

* Update morgue.dm

* Update morgue.dm
2018-02-05 03:20:09 -06:00
CitadelStationBot
43ee34838f [MIRROR] Adds pineapples to botany, and Hawaiian pizza (#5260)
* Adds pineapples to botany, and Hawaiian pizza

* Update packs.dm
2018-02-05 03:00:22 -06:00
CitadelStationBot
32fab09c69 [MIRROR] Remove revenantspawn landmark from code (#5271)
* Remove revenantspawn landmark from code (#35238)

* Remove revenantspawn landmark from code
2018-02-05 01:47:16 -06:00
CitadelStationBot
b16d2148e4 [MIRROR] Steampunk Watches! (#5293)
* Steampunk Watches! (#35187)

* Adds steampunk watches

* Adds steampunk watches to arcade machines

* The steampunk watch can now play a noise!

* Steampunk Watches!
2018-02-05 01:31:16 -06:00
CitadelStationBot
64c43ee5bc Morgue Trays now provide correct light-indication (#5262) 2018-02-05 01:26:36 -06:00
CitadelStationBot
0c74a7eede [MIRROR] Holorays! (#5261)
* Holorays!

* adding missing .dmi
2018-02-05 01:10:29 -06:00
CitadelStationBot
584fc7151b [MIRROR] makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#5256)
* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things (#34888)

* traps patch

* flags!

* makes reebe more than steam vent + brass skewer + pressure sensor + matrix simulator 2k18 by adding adjacency checks and some other things
2018-02-05 00:57:31 -06:00
CitadelStationBot
7c56b53aab [MIRROR] Ports telecoms to Initialize (#5249)
* Ports telecoms to Initialize

* Update telecomunications.dm
2018-02-05 00:57:04 -06:00
CitadelStationBot
662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246)
* Lavaland bomb runtime fix

* Update cleanable.dm
2018-02-05 00:56:37 -06:00
CitadelStationBot
0d01cb1f56 [MIRROR] Adds a log out button to record screen of the security records and allows you to print photos that are on file (#5298)
* Adds a log out button to record screen of the security records and also allows you to print photos (#35160)

* Adds a log out button to record screen of the security records and allows you to print photos that are on file
2018-02-05 00:54:22 -06:00
CitadelStationBot
17ccbb4a53 [MIRROR] Adds tiny shards (#5299)
* Adds tiny shards (#35070)

* Adds tiny shards

* .

* .

* .

* .

* .

* .

* Adds tiny shards
2018-02-05 00:53:52 -06:00
CitadelStationBot
de1d277b65 [MIRROR] Buffs Clogged Vents (#5301)
* Buffs Clogged Vents (#34949)

* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Buffs Clogged Vents
2018-02-05 00:52:06 -06:00
CitadelStationBot
e95269398c [MIRROR] Fixes sending cross station messages during wait period. (#5311)
* Merge pull request #35286 from DaxDupont/commsfix

Fixes sending cross station messages during wait period.

* Fixes sending cross station messages during wait period.
2018-02-05 00:49:03 -06:00
CitadelStationBot
a5d1cae1ac [MIRROR] Fixes smugglers satchels being able to refresh items forever (#5313)
* Fixes smugglers satchels being able to refresh items forever (#35270)

* Fixes smugglers satchels being able to refresh items forever
2018-02-05 00:48:12 -06:00
CitadelStationBot
298b37cacb [MIRROR] Makes slime scanning more readable (#5314)
* Merge pull request #35274 from XDTM/SlimeScan

Makes slime scanning more readable

* Makes slime scanning more readable
2018-02-05 00:46:52 -06:00
CitadelStationBot
330a6ca0af Added transit tubes to the RPD (#5300) 2018-02-05 00:46:34 -06:00
cebutris
53ce73528a Buffs tablepushing (#5222)
* Buffs tablepushing

* review
2018-02-04 23:26:43 -06:00
CitadelStationBot
8fe05c8171 [MIRROR] Allows blobs to destroy decals (#5279)
* Allows blobs to destroy decals

* Allows blobs to destroy decals
2018-02-04 23:14:15 -06:00
CitadelStationBot
6a180f7e4a [MIRROR] NODISMEMBER species will no longer lose limbs when cloning (#5278)
* NODISMEMBER species will no longer lose limbs when cloning (#35247)

* NODISMEMBER species will no longer lose limbs when cloning
2018-02-04 23:14:00 -06:00
CitadelStationBot
60292af57f [MIRROR] Disentangles Command Reports from Metagame (#5294)
* Disentangles Command Reports from Metagame (#35192)

* False report fix

* Less Accurate Command Report

* Disentangles Command Reports from Metagame
2018-02-04 23:11:32 -06:00
CitadelStationBot
d346420e9f [MIRROR] Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby() (#5265)
* Merge pull request #35210 from Xhuis/pipe_fingerprints

Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby()

* Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby()
2018-02-04 22:46:58 -06:00
CitadelStationBot
3a7d148417 [MIRROR] Soap now has inhand sprites (#5257)
* Soap now has inhand sprites (#35159)

* Delete items_lefthand.dmi

* Add files via upload

* Delete items_righthand.dmi

* Add files via upload

* Delete custodial_lefthand.dmi

* Delete custodial_righthand.dmi

* Add files via upload

* Delete items_lefthand.dmi

* Delete items_righthand.dmi

* Add files via upload

* Update clown_items.dm

* Soap now has inhand sprites
2018-02-04 22:35:31 -06:00
CitadelStationBot
b1e9ca385f [MIRROR] Adds yeehaw to the discoball dj soundboard (#5254)
* yeehaw (#35172)

* Adds yeehaw to the discoball dj soundboard
2018-02-04 22:30:10 -06:00
CitadelStationBot
0941f98f96 [MIRROR] Cleans up single frame get flat icon. (#5245)
* Merge pull request #35171 from AnturK/thanksbyond

Cleans up single frame get flat icon.

* Cleans up single frame get flat icon.
2018-02-04 22:21:24 -06:00
CitadelStationBot
50fa4d2239 [MIRROR] Blacklists servant golems from the magic mirror (#5234)
* Blacklists servant golems from the magic mirror (#35147)

* Blacklists servant golems from the magic mirror
2018-02-04 22:11:32 -06:00
CitadelStationBot
e2ce020a62 [MIRROR] Fixes a couple of typos and ports one New to Initialize (#5233)
* Merge pull request #35145 from vuonojenmustaturska/acidtypos

Fixes a couple of typos and ports one New to Initialize

* Fixes a couple of typos and ports one New to Initialize
2018-02-04 22:11:07 -06:00
cebutris
44908503bf Stunswords! (#5179)
* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
2018-02-04 22:10:21 -06:00
CitadelStationBot
31b261ff7b [MIRROR] Increases mineral amount needed for rough metal false walls (#5229)
* Increases mineral amount needed for rough metal false walls (#35065)

* Increases mineral amount needed for rough metal false walls
2018-02-04 22:08:28 -06:00
CitadelStationBot
4d1a5db892 [MIRROR] Corrects Some \ref Macros (#5228)
* Merge pull request #35136 from uraniummeltdown/correcttheref

Corrects Some \ref Macros

* Corrects Some \ref Macros
2018-02-04 22:08:05 -06:00
CitadelStationBot
684c98d2e2 [MIRROR] Cloner checks if occupant is human rather than just carbon (#5227)
* Cloner checks if occupant is human rather than just carbon (#35077)

* Makes cloner sure its human

* Revert "Makes cloner sure its human"

This reverts commit 2591f2a7cd74cc83d9afcbac5df59bfea20962df.

* travis fix maybe

* Cloner checks if occupant is human rather than just carbon
2018-02-04 22:07:42 -06:00
Poojawa
f8b030f18f Can't trust people not to cause problems. 2018-02-04 19:11:10 -06:00
Poojawa
40c98ad9ff adds sickshot to the same lockers as defibs 2018-02-03 10:40:42 -06:00
Poojawa
aa04e62b29 cult lol xd 2018-01-31 08:07:22 -06:00
Poojawa
d7f8b8fbe4 dme enabling 2018-01-31 07:17:21 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
deathride58
34b93a8d42 Merge pull request #5159 from Citadel-Station-13/upstream-merge-34926
[MIRROR] Makes revenants spawn on dead bodies & bodycontainers
2018-01-29 02:30:17 +00:00
deathride58
7673583ce1 Merge pull request #5157 from Citadel-Station-13/upstream-merge-35025
[MIRROR] Warp whistle now respects notransform
2018-01-29 02:29:18 +00:00
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant
Makes revenants spawn on dead bodies & bodycontainers
2018-01-28 18:03:41 -06:00
Leo
b543882c64 Merge pull request #35025 from vuonojenmustaturska/toot
Warp whistle now respects notransform
2018-01-28 15:08:33 -06:00
Leo
59eac5ca55 Merge pull request #34983 from tgstation/Cyberboss-patch-1
Removes /New() from landmarks
2018-01-28 15:08:25 -06:00
LetterJay
2d4065e15c Merge pull request #5143 from Citadel-Station-13/upstream-merge-34866
[MIRROR] Fixes the eminence getting spammed by blessed tiles.
2018-01-28 04:01:20 -06:00
Dax Dupont
643e58714e Fixes the eminence getting spammed by blessed tiles. (#34866)
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
2018-01-27 23:21:48 -06:00