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

5038 Commits

Author SHA1 Message Date
vuonojenmustaturska
6a094232bc Merge pull request #35642 from MrStonedOne/patch-482 
[s]Fixes blacklisted byond builds
 2018-02-13 16:48:48 -06:00
deathride58
637720a3d9 Merge pull request #5465 from Citadel-Station-13/upstream-merge-35597 
[MIRROR] The Cook now only works under siege.
 2018-02-13 21:24:18 +00:00
Iamgoofball
5793fe893f The Cook now only works under siege. (#35597) 
The chef's CQC skill now only works in the kitchen area
 2018-02-13 14:18:49 -06:00
oranges
e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
deathride58
fd707fa9d0 Merge pull request #5460 from Citadel-Station-13/upstream-merge-35571 
[MIRROR] Fixes spider_infestation event
 2018-02-13 17:18:45 +00:00
LetterJay
311463c03d Merge pull request #5459 from Citadel-Station-13/upstream-merge-35574 
[MIRROR] Sanity check for sentience event
 2018-02-13 10:27:09 -06:00
LetterJay
42c197b1df Merge pull request #5458 from Citadel-Station-13/upstream-merge-35625 
[MIRROR] Removes the empty moth language file
 2018-02-13 10:26:57 -06:00
vuonojenmustaturska
3c9966041d Merge pull request #35571 from ShizCalev/spider_infestation-fix 
Fixes spider_infestation event
 2018-02-13 10:23:28 -06:00
vuonojenmustaturska
a103a44252 Merge pull request #35574 from ShizCalev/sentience-fix 
Sanity check for sentience event
 2018-02-13 10:00:47 -06:00
Leo
6d980b488d Merge pull request #35625 from praisenarsie/patch-31 
Removes the empty moth language file
 2018-02-13 08:55:12 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
LetterJay
7cf942250c Merge pull request #5455 from Citadel-Station-13/upstream-merge-35572 
[MIRROR] Fixes skateboard runtime
 2018-02-13 06:28:05 -06:00
LetterJay
8a957d64bf Merge pull request #5454 from Citadel-Station-13/upstream-merge-35576 
[MIRROR] Fixes blood contracts being unusable if the popup is cancelled
 2018-02-13 06:27:55 -06:00
ShizCalev
c45c1c17df Fixes scooter runtime 2018-02-12 23:43:32 -06:00
YPO
e3e65a5237 Fixes blood contracts being unusable if the popup is cancelled 2018-02-12 23:42:19 -06:00
Buggy123
0c9bb1a249 Tritium now produces water vapor when combusting. (#35354) 
* HYDROGEN+OXYGEN=WATER

* Burning Tritium now produces a lot of radiation.

* Fixes check and line positions

* No longer spews absurd quantities of radiation.
 2018-02-12 21:11:22 -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
Jordan Brown
59f7343c5e Merge pull request #35603 from MrStonedOne/patch-480 
blacklists 512.1408 for basically being a wallhack (again)
 2018-02-12 16:23:44 -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
Dax Dupont
a0feb17597 Cell chargers are now buildable and (upgradable!) machines. 2018-02-12 11:15:52 -06:00
LetterJay
6f117401de Merge pull request #5438 from Citadel-Station-13/upstream-merge-35524 
[MIRROR] Fatshaming the AI, moving him two tiles upward when mass_recall() happens
 2018-02-12 10:04:56 -06:00
LetterJay
2171016baa Merge pull request #5436 from Citadel-Station-13/upstream-merge-35549 
[MIRROR] Removes old golem items
 2018-02-12 10:04:31 -06:00
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
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
Dax Dupont
c40925f529 Fatshaming the AI, moving him two tiles upward when mass_recall() happens (#35524) 2018-02-12 09:20:52 -06:00
vuonojenmustaturska
3d5e49f06d Merge pull request #35549 from KorPhaeron/golem 
Removes old golem items
 2018-02-12 09:09:14 -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
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
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
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
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
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
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
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
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