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

8716 Commits

Author SHA1 Message Date
LetterJay
ef8ce89fe2 Merge pull request #5435 from Citadel-Station-13/upstream-merge-35558 
[MIRROR] fulton pack not allowed on supply shuttle
 2018-02-12 10:04:12 -06:00
LetterJay
5a9b7a5173 Merge pull request #5434 from Citadel-Station-13/upstream-merge-35541 
[MIRROR] Fixes lye/plastic/charcoal conflicts
 2018-02-12 10:03:16 -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
vuonojenmustaturska
0d40303254 Merge pull request #35558 from praisenarsie/patch-28 
fulton pack not allowed on supply shuttle
 2018-02-12 09:07:02 -06:00
vuonojenmustaturska
379ff0546a Merge pull request #35541 from 81Denton/chem-conflicts 
Fixes lye/plastic/charcoal conflicts
 2018-02-12 09:02: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
17ed07d3b2 Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417 
[MIRROR] The chef is also a cook
 2018-02-11 23:35:29 +00:00
deathride58
081f7d3cbe Merge pull request #5408 from Michiyamenotehifunana/magrifle-fix 
Fixes and Reimplements Magnetic Weapons
 2018-02-11 23:34:45 +00: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
e69a597fb2 Update lavaland_ruin_code.dm 2018-02-11 18:31:57 -05: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
deathride58
9b4ab9a45e Merge pull request #5428 from Citadel-Station-13/upstream-merge-35515 
[MIRROR] Makes urinal cakes more realistic
 2018-02-11 23:30:32 +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
deathride58
8aacd2c804 Update job_exp.dm 2018-02-11 16:44:29 -05: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
vuonojenmustaturska
95c2eb283a The chef is also a cook (#35417) 
* just a lowly, lowly cook

* come on, that's not striking an officer
 2018-02-11 15:26:33 -06:00
Jordan Brown
08a12bba53 Fix sql error in exp updates 2018-02-11 15:25:23 -06:00
CitadelStationBot
88e7fdabd6 Merge pull request #5423 from Citadel-Station-13/upstream-merge-35501 
[MIRROR] Removed admin requirement for the notify chat command
 2018-02-11 13:18:27 -06:00
CitadelStationBot
39b4f8283d Merge pull request #5422 from Citadel-Station-13/upstream-merge-35508 
[MIRROR] Fixes scaner circuit typo
 2018-02-11 13:18:09 -06:00
Shadowlight213
080792a7a6 Removed admin requirement for the notify chat command (#35501) 2018-02-11 12:45:18 -06:00
ShizCalev
eb484edc2e Fixes scaner circuit typo (#35508) 2018-02-11 12:43:06 -06:00
BordListian
87a1e69238 - You don't get to bring friends (#35510) 2018-02-11 12:41:52 -06:00
CitadelStationBot
a55e4a3f90 Merge pull request #5413 from Citadel-Station-13/upstream-merge-35421 
[MIRROR] Ruins now log to world only in TESTING mode
 2018-02-11 09:44:26 -06:00
CitadelStationBot
6de4146031 Merge pull request #5419 from Citadel-Station-13/upstream-merge-35504 
[MIRROR] Removes that annoying clunking steam engine ambience sound that's probably from a youtube video
 2018-02-11 09:44:06 -06:00
CitadelStationBot
9025a3df29 Merge pull request #5418 from Citadel-Station-13/upstream-merge-35502 
[MIRROR] pet carriers can be actually made
 2018-02-11 09:43:17 -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
81dcb41a4d Merge pull request #5417 from Citadel-Station-13/upstream-merge-35516 
[MIRROR] [s]Blacklists the most recent version of byond for basically being a wall hack
 2018-02-11 07:38:54 -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
CitadelStationBot
5b1880fd47 Update artefact.dm 2018-02-11 07:37:25 -06:00
Leo
4195cf4491 Merge pull request #35504 from vuonojenmustaturska/delambieng1 
Removes that annoying clunking steam engine ambience sound that's probably from a youtube video
 2018-02-11 07:36:24 -06:00
Leo
b55fd38680 Merge pull request #35502 from Tlaltecuhtli/patch-1 
pet carriers can be actually made
 2018-02-11 07:34:51 -06:00
CitadelStationBot
092370e366 Merge pull request #5412 from Citadel-Station-13/upstream-merge-35451 
[MIRROR] Buildable and upgradable All-In-One Grinder (again)
 2018-02-11 05:37:26 -06:00
CitadelStationBot
a60e56597c Update soft_caps.dm 2018-02-11 05:35:55 -06:00
Kyle Spier-Swenson
affcbcd609 [s]Blacklists the most recent version of byond for basically being a wall hack (#35516) 
* Blacklisted client builds.

* Missed a spot

* glob was a mistake
 2018-02-11 05:14:04 -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
Jordan Brown
26174bd317 Ruins now log to world only in TESTING mode (#35421) 
* Ruins now log to the game log instead of the runtime log

* Remove it entirely

* Use TESTING
 2018-02-11 05:13:18 -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
Dax Dupont
7992256bcb Grabbers can now only contain things smaller than the assembly. (#35462) 
* Grabbers can now only contain things smaller than the assembly

* Good suggestion buggy

* fucking github broke
 2018-02-11 05:08:41 -06:00
ShizCalev
f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Michiyamenotehifunana
440e102b34 Fixes and reimplements mag weapons 
GREAT FUCKING JOB KEVINZ
 2018-02-11 12:12:43 +08: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
deathride58
a34dc0b90b Update personality.dm 2018-02-10 19:51:21 -05:00
deathride58
33a4ef416b Merge pull request #5405 from Citadel-Station-13/upstream-merge-35493 
[MIRROR] Fixed cloning pod status not updating when autocloning.
 2018-02-11 00:50:35 +00:00