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

3334 Commits

Author SHA1 Message Date
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
oranges
aa4b92faad Merge pull request #35598 from ShizCalev/announcement-exploit-fix 
[s] fixes announcement system exploit
 2018-02-12 19:33:28 -06:00
deathride58
06b7f239c4 Merge pull request #5447 from Citadel-Station-13/upstream-merge-35433 
[MIRROR] Cult Update? Cult Update!
 2018-02-12 23:29:06 +00:00
vuonojenmustaturska
a60410b347 Merge pull request #35557 from ShizCalev/pda-virus-fix 
Fixes PDA virus runtime
 2018-02-12 16:32:07 -06:00
Robustin
1825c944b6 Cult Update? Cult Update! (#35433) 
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
 2018-02-12 15:18:21 -06:00
deathride58
f5eb7f7101 Update cell_charger.dm 2018-02-12 13:42:51 -05:00
Dax Dupont
a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
LetterJay
e4c49c3ce4 Merge pull request #5433 from Citadel-Station-13/upstream-merge-35566 
[MIRROR] Urinal cakes can now be picked up again
 2018-02-12 10:03:05 -06:00
LetterJay
15572d1d5f Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514 
[MIRROR] Fixes wrong ID for syndicate ghost roles
 2018-02-12 10:01:42 -06:00
MoreRobustThanYou
0af6af731a Urinal cakes can now be picked up again (#35566) 
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
 2018-02-12 09:01:28 -06:00
deathride58
75249cab07 Merge pull request #5431 from Citadel-Station-13/upstream-merge-35518 
[MIRROR] Actually fixes broken accesses
 2018-02-11 23:34:13 +00:00
deathride58
cfc52b01de Merge pull request #5429 from Citadel-Station-13/upstream-merge-35519 
[MIRROR] Highlander antag datum
 2018-02-11 23:31:06 +00:00
Jordan Brown
ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2 
Actually fixes broken accesses
 2018-02-11 15:48:40 -06:00
Jordan Brown
e2b4e3c567 Fixes wrong ID for syndicate ghost roles 2018-02-11 15:35:14 -06:00
AnturK
4615696173 Highlander antag datum (#35519) 
* Highlander antag datum

* Forgot debug line

* Also this
 2018-02-11 15:33:02 -06:00
MoreRobustThanYou
6337c294d9 Makes urinal cakes more realistic (#35515) 
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
 2018-02-11 15:29:47 -06:00
BordListian
87a1e69238 - You don't get to bring friends (#35510) 2018-02-11 12:41:52 -06:00
CitadelStationBot
51d15518ae Merge pull request #5409 from Citadel-Station-13/upstream-merge-35456 
[MIRROR] [s] Fixes altclick exploits
 2018-02-11 09:43:09 -06:00
CitadelStationBot
74c083fc89 Merge pull request #5416 from Citadel-Station-13/upstream-merge-35188 
[MIRROR] Adds a SCP-294 ruin
 2018-02-11 07:38:37 -06:00
CitadelStationBot
f3569cf023 Merge pull request #5415 from Citadel-Station-13/upstream-merge-35235 
[MIRROR] Mining sentience upgrade grants minebots a radio and ID
 2018-02-11 07:38:14 -06:00
CitadelStationBot
088ad78f95 Merge pull request #5414 from Citadel-Station-13/upstream-merge-35376 
[MIRROR] Buildable Shuttle/Plastitanium Windows
 2018-02-11 07:38:06 -06:00
MoreRobustThanYou
73c1088d5a Adds a SCP-294 ruin 2018-02-11 05:13:56 -06:00
KorPhaeron
e64a42c248 Mining sentience upgrade grants minebots a radio and ID (#35235) 
* Minebots get mining radio+ID card

* Updates radio implant paths
 2018-02-11 05:13:46 -06:00
uraniummeltdown
e3ec8a648a Buildable Shuttle/Plastitanium Windows (#35376) 
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
 2018-02-11 05:13:37 -06:00
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
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
deathride58
21be004afa Merge pull request #5406 from Citadel-Station-13/upstream-merge-35424 
[MIRROR] Replaces some var values with defines
 2018-02-11 02:24:48 +00:00
Jordan Brown
fd479e7128 Replaces some var values with defines 2018-02-10 11:11:09 -06:00
Jordan Brown
3674d38a99 Merge pull request #35493 from DaxDupont/cloner 
Fixed cloning pod status not updating when autocloning.
 2018-02-10 11:09:52 -06:00
Robustin
25323a9b12 Fixes limbgrower having max volume of 0 (#35491) 
* Fixed limbgrower having maxvolume of 0

* Update limbgrower.dm
 2018-02-10 09:56:56 -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
LetterJay
f5666c115a Merge pull request #5370 from Citadel-Station-13/upstream-merge-35398 
[MIRROR] Removes an unnecessary type check from autolathe attackby
 2018-02-08 07:12:48 -06:00
vuonojenmustaturska
79a4b9be58 Fix intendation on embedding datum initializer (#35447) 2018-02-08 04:59:18 -06:00
oranges
39b6d1fb49 Merge pull request #35398 from ACCount12/pr_atomization 
Removes an unnecessary type check from autolathe attackby
 2018-02-08 03:19:50 -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
MMMiracles
2d499b938c adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free (#35168) 
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want

* dirty vars

* Vars

* changes windoor to proper subtype, removed extra circular saw

* area/space to area/ruin/unpowered, added gps tag

* in area/space nobody can hear you scream

* Update mrow_thats_right.dmm

if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes

* cat
 2018-02-07 20:23:32 -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
b1ea2773fd Merge pull request #5357 from Citadel-Station-13/upstream-merge-35383 
[MIRROR] Changes doppler array point formula
 2018-02-07 20:52:09 +00: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
7295e9ba82 Update doppler_array.dm 2018-02-07 14:14:53 -05:00
deathride58
e2a6e36ae5 Merge branch 'master' into upstream-merge-35383 2018-02-07 19:13:41 +00:00
deathride58
0d7d8095bb Update doppler_array.dm 2018-02-07 14:13:13 -05: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
fc74a6a341 Merge pull request #5351 from Citadel-Station-13/upstream-merge-35303 
[MIRROR] Holopictures and more!
 2018-02-07 19:10:37 +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
7736dddcf6 Merge pull request #5345 from Citadel-Station-13/upstream-merge-35371 
[MIRROR] doppler arrays no longer runtime when processing < 5/10/20 bombs
 2018-02-07 19:07:53 +00:00