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

13865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vuonojenmustaturska
cec7acc0ea Merge pull request #35725 from jakeramsay007/slimepeoplefixes 
Jellypeople (and all subtypes) now can actually speak Slime, as intended
 2018-02-17 10:05:47 -06:00
LetterJay
b6ad24b9da Merge pull request #5541 from Citadel-Station-13/upstream-merge-35734 
[MIRROR] Cleans up unused /area paths
 2018-02-17 09:57:18 -06:00
CitadelStationBot
6784d463ab Automatic changelog generation for PR #5540 [ci skip] 2018-02-17 09:56:53 -06:00
LetterJay
8d949c42b3 Merge pull request #5540 from Citadel-Station-13/upstream-merge-34908 
[MIRROR] Adds Modafinil properly this time.
 2018-02-17 09:56:50 -06:00
LetterJay
7b87214309 Merge pull request #5537 from Citadel-Station-13/upstream-merge-35717 
[MIRROR] Fixes AI dating
 2018-02-17 09:56:40 -06:00
LetterJay
582cd2fe15 Merge pull request #5536 from Citadel-Station-13/upstream-merge-35716 
[MIRROR] Fixes wet space.
 2018-02-17 09:56:32 -06:00
LetterJay
dc31a16fbb Merge pull request #5530 from Citadel-Station-13/upstream-merge-35704 
[MIRROR] Changes a number of HUD icons
 2018-02-17 09:55:57 -06:00
CitadelStationBot
88cc94089b Cleans up unused /area paths 2018-02-17 09:39:20 -06:00
vuonojenmustaturska
7214836012 Merge pull request #35734 from ShizCalev/path-cleanup 
Cleans up unused /area paths
 2018-02-17 09:39:20 -06:00
CitadelStationBot
612565254a Adds Modafinil properly this time. 2018-02-17 09:38:08 -06:00
yorii
f0be955c17 Adds Modafinil properly this time. (#34908) 
* Adds modafinil, a sleep suppressant

* Adds recipe for modafinil

Yes I'm afraid of git now

* Fixed modafinil sleepimmune ids and OD to 15u

During testing 10u was simply much too low

* Change OD sleeping proc to use ignore_sleepimmune

* Fixed stuff to modafinil
 2018-02-17 09:38:08 -06:00
CitadelStationBot
377c591024 Fixes AI dating 2018-02-17 00:48:27 -06:00
Jordan Brown
cbb11e81e6 Merge pull request #35717 from AnturK/robolove 
Fixes AI dating
 2018-02-17 00:48:26 -06:00
CitadelStationBot
ace5efd721 Fixes wet space. 2018-02-17 00:48:18 -06:00
Jordan Brown
48f6e72293 Merge pull request #35716 from AnturK/slipspace 
Fixes wet space.
 2018-02-17 00:48:18 -06:00
Poojawa
1bc3908203 Fix missing brain damage picks 2018-02-16 13:33:06 -06:00
Poojawa
ce281774e1 I mean, I guess? (#5521) 2018-02-16 13:28:37 -06:00
LetterJay
61b5191f90 Merge pull request #5528 from Citadel-Station-13/upstream-merge-35702 
[MIRROR] Removes secondary
 2018-02-16 12:10:55 -06:00
LetterJay
209f5dfbba Merge pull request #5529 from Citadel-Station-13/upstream-merge-35697 
[MIRROR] Fixes addiction text
 2018-02-16 12:10:37 -06:00
CitadelStationBot
b6368d5a8e Automatic changelog generation for PR #5532 [ci skip] 2018-02-16 12:10:20 -06:00
LetterJay
e57623ca76 Merge pull request #5532 from Citadel-Station-13/upstream-merge-35689 
[MIRROR] Space Ninja smoke bomb refill
 2018-02-16 12:10:18 -06:00
LetterJay
b949355888 Merge pull request #5531 from Citadel-Station-13/upstream-merge-35690 
[MIRROR] Some antag fixes.
 2018-02-16 12:10:04 -06:00
CitadelStationBot
24e8ec8bcb Space Ninja smoke bomb refill 2018-02-16 10:39:13 -06:00
MetroidLover
55f9129141 Space Ninja smoke bomb refill (#35689) 
* Ninja Smoke Bomb refill

Adds Ninja smoke bomb refill ability.

* Change a spaghetti flaw.

* I fluffed the indentation again. :P
 2018-02-16 10:39:13 -06:00
CitadelStationBot
7b42924054 Some antag fixes. 2018-02-16 10:35:56 -06:00
AnturK
3e12e1b2f6 Some antag fixes. (#35690) 
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
 2018-02-16 10:35:55 -06:00
CitadelStationBot
1a8a134786 Changes a number of HUD icons 2018-02-16 10:34:45 -06:00
Slignerd
cbe4734216 Changes a number of HUD icons (#35704) 
* Updates hud.dmi

* Makes clown's nose big again

* Updates contraband balloons

* Changes HUD icons and HUD-themed balloons
 2018-02-16 10:34:45 -06:00
CitadelStationBot
4471555831 Fixes addiction text 2018-02-16 10:33:32 -06:00
Jordan Brown
238591128c Merge pull request #35697 from praisenarsie/patch-34 
Fixes addiction text
 2018-02-16 10:33:32 -06:00
CitadelStationBot
0b69d53ce8 Removes secondary 2018-02-16 10:32:18 -06:00
Jordan Brown
fc7dbc8322 Merge pull request #35702 from DaedalusGame/scholar-of-the-first-sin-edition 
Removes secondary
 2018-02-16 10:32:18 -06:00
CitadelStationBot
879d15c18d Automatic changelog generation for PR #5506 [ci skip] 2018-02-16 08:27:29 -06:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431 
[MIRROR] html_interface removal and crew monitoring console refactor.
 2018-02-16 14:27:26 +00:00
CitadelStationBot
f76cc84107 Automatic changelog generation for PR #5522 [ci skip] 2018-02-16 08:17:56 -06:00
deathride58
8fa2cd7738 Merge pull request #5522 from Citadel-Station-13/upstream-merge-35703 
[MIRROR] Fixes powercell injecting attaching the wrong value to rigged
 2018-02-16 14:17:53 +00:00
deathride58
a2ae777a5a Merge pull request #5524 from Citadel-Station-13/upstream-merge-35629 
[MIRROR] Converts floor tool interactions to tool_act, fixes flooring exploits
 2018-02-16 14:16:23 +00:00
deathride58
0cd914bf96 Merge pull request #5526 from Citadel-Station-13/upstream-merge-35687 
[MIRROR] Fixes delta whiteship
 2018-02-16 14:15:51 +00:00
CitadelStationBot
e7b832df1f Automatic changelog generation for PR #5527 [ci skip] 2018-02-16 08:15:15 -06:00
deathride58
57e6eb7b1e Merge pull request #5527 from Citadel-Station-13/upstream-merge-35696 
[MIRROR] Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 14:15:12 +00:00
CitadelStationBot
1dc271f40e Automatic changelog generation for PR #5490 [ci skip] 2018-02-16 07:58:16 -06:00
LetterJay
dd5c717152 Merge pull request #5490 from cebutris/ssword 
Adds stunsword modification kits to the security vendor
 2018-02-16 07:58:14 -06:00
LetterJay
a2d0aa25a6 Merge pull request #5520 from Citadel-Station-13/upstream-merge-35656 
[MIRROR] Fixes a runtime in NTNet scanner
 2018-02-16 07:55:42 -06:00
LetterJay
ad8bab3fc1 Merge pull request #5519 from Citadel-Station-13/upstream-merge-35484 
[MIRROR] Converting more auto_custom antagonists.
 2018-02-16 07:55:29 -06:00
CitadelStationBot
f6f8d98264 Automatic changelog generation for PR #5518 [ci skip] 2018-02-16 07:55:22 -06:00
LetterJay
798ba717fa Merge pull request #5518 from Citadel-Station-13/upstream-merge-35679 
[MIRROR] Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement
 2018-02-16 07:55:19 -06:00
CitadelStationBot
ae50244e2e Automatic changelog generation for PR #5517 [ci skip] 2018-02-16 07:55:11 -06:00
LetterJay
58a9e32af3 Merge pull request #5517 from Citadel-Station-13/upstream-merge-35662 
[MIRROR] Meteor shield emag feedback and typo fix
 2018-02-16 07:55:09 -06:00
CitadelStationBot
6227668842 Fixes wizard RPG loot from making circuit analyzers useless 2018-02-16 07:52:59 -06:00
Jordan Brown
d6b493f2ec Merge pull request #35696 from Xhuis/circuit_rpg_loot 
Fixes wizard RPG loot from making circuit analyzers useless
 2018-02-16 07:52:59 -06:00