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

1608 Commits

Author SHA1 Message Date
Mokiros
cdcb5fc72f Buildable and upgradable All-In-One Grinder (#35451) 
Circuit is in "Biological Processing" techweb node
 2018-02-11 05:12:23 -06:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
vuonojenmustaturska
56369b7f99 Fixes geiger counters on engiborgs (#35423) 
* a commit

* Update geiger_counter.dm
 2018-02-08 11:21:27 -06:00
Jordan Brown
6f60dd1591 Merge pull request #35418 from kevinz000/patch-445 
Allows projectiles to pass portals
 2018-02-08 09:05:02 -06:00
LetterJay
69f62c75db Merge pull request #5372 from Citadel-Station-13/upstream-merge-35447 
[MIRROR] Fix intendation on embedding datum initializer
 2018-02-08 07:13:11 -06:00
vuonojenmustaturska
79a4b9be58 Fix intendation on embedding datum initializer (#35447) 2018-02-08 04:59:18 -06:00
oranges
d427e0174b Merge pull request #35346 from DaxDupont/kinky-cuffs 
Fixes cyborg related cuffing issues
 2018-02-08 03:07:51 -06:00
Jordan Brown
bbf970c213 Merge pull request #35409 from epochayur/master 
Belts now have inhand sprites
 2018-02-07 23:48:17 -06:00
CitadelStationBot
717da969a6 [MIRROR] Var cleanup and map fixes (#5359) 
* Merge pull request #35429 from ShizCalev/snowdin-cleanup

Var cleanup and map fixes

* Var cleanup and map fixes
 2018-02-07 20:04:04 -06:00
deathride58
bfce0e4885 Merge pull request #5339 from Citadel-Station-13/upstream-merge-35352 
[MIRROR] Toy Daggers!
 2018-02-07 20:51:39 +00:00
deathride58
6e469dcf88 Merge pull request #5355 from Citadel-Station-13/upstream-merge-35393 
[MIRROR] blueprint area changes are now logged to the game log
 2018-02-07 19:11:47 +00:00
deathride58
8e439ec317 Merge pull request #5354 from Citadel-Station-13/upstream-merge-35369 
[MIRROR] Adds the saltmine shuttle.
 2018-02-07 19:11:31 +00:00
deathride58
830b33da59 Merge pull request #5347 from Citadel-Station-13/upstream-merge-35360 
[MIRROR] Removes synths and androids from magic mirror
 2018-02-07 19:08:27 +00:00
deathride58
4600ace2bd Merge pull request #5344 from Citadel-Station-13/upstream-merge-35363 
[MIRROR] Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 19:07:39 +00:00
vuonojenmustaturska
13b01b042e Merge pull request #35393 from optimumtact/blueprintlogging 
blueprint area changes are now logged to the game log
 2018-02-07 07:44:54 -06:00
Dax Dupont
0f8b7da2a1 Adds the saltmine shuttle. (#35369) 
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
 2018-02-07 07:17:50 -06:00
vuonojenmustaturska
ca5f5f6f1f Merge pull request #35360 from Robustin/blackmirror 
Removes synths and androids from magic mirror
 2018-02-07 04:42:01 -06:00
vuonojenmustaturska
192e548bb3 Merge pull request #35363 from Xhuis/chair_nerf 
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
 2018-02-07 04:39:21 -06:00
BordListian
9b910552fd Forces gases to obey certain laws of nature (#35277) 
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
 2018-02-07 02:32:31 -06:00
ShiggyDiggyDo
991922b323 Toy Daggers! 2018-02-07 02:31:58 -06:00
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
389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05: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
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
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
662f1904aa [MIRROR] Lavaland bomb runtime fix (#5246) 
* Lavaland bomb runtime fix

* Update cleanable.dm
 2018-02-05 00:56:37 -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
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
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
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
Poojawa
f8b030f18f Can't trust people not to cause problems. 2018-02-04 19:11:10 -06:00