shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,254 Commits 5 Branches 0 Tags
2d06c71404bc025cff4289909d2e7e72c18dffbb
Commit Graph

3273 Commits

Author SHA1 Message Date
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
CitadelStationBot
b6c4bd6e01 [MIRROR] Fixes bloodpack sprite issues (#5333) 
* Fixes bloodpack sprite issues

* Update packs.dm

* fuck this godamn map
 2018-02-06 18:24:51 -06:00
deathride58
0696c9eac5 Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324 
[MIRROR] Fix defibrillator mount runtiming continously while empty
 2018-02-06 02:48:52 +00:00
deathride58
f593263a9d Merge pull request #5326 from Citadel-Station-13/upstream-merge-35295 
[MIRROR] Fix holorays staying if you switch holopads
 2018-02-06 02:44:45 +00:00
deathride58
3a79a17399 Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316 
[MIRROR] Fixes comm message list for non-unique messages.
 2018-02-06 02:44:29 +00:00
deathride58
85b06c800a Merge pull request #5319 from Citadel-Station-13/upstream-merge-35299 
[MIRROR] fixes small grammar issue on arcades
 2018-02-06 02:43:20 +00:00
vuonojenmustaturska
a7057f8331 Merge pull request #35324 from AutomaticFrenzy/patch/defibrillator-runtime 
Fix defibrillator mount runtiming continously while empty
 2018-02-05 17:59:24 -06:00
MoreRobustThanYou
e3f5654eb7 Fix holorays staying if you switch holopads (#35295) 
* Fix holorays staying if you switch holopads

* Update hologram.dm
 2018-02-05 15:16:39 -06:00
Leo
f574bea5d1 Merge pull request #35316 from AnturK/commfix 
Fixes comm message list for non-unique messages.
 2018-02-05 14:37:50 -06:00
deathride58
389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05:00
vuonojenmustaturska
903ab00096 Merge pull request #35299 from ShiggyDiggyDo/arcadegrammar 
fixes small grammar issue on arcades
 2018-02-05 09:11:51 -06:00
MMMiracles
4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
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