shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,917 Commits 5 Branches 0 Tags
e9f6fb08bdbb422af77b6fe42820726ff29aa5e1
Commit Graph
13917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub e9f6fb08bd Merge pull request #5539 from Citadel-Station-13/upstream-merge-35731 
[MIRROR] Map spawned corpses start with their suit sensors turned off
 2018-02-17 19:31:34 +00:00
CitadelStationBot d017dc0517 Automatic changelog generation for PR #5535 [ci skip] 2018-02-17 13:31:22 -06:00
deathride58andGitHub 5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707 
[MIRROR] Adds rainbow slime clusterbangs
 2018-02-17 19:31:20 +00:00
deathride58andGitHub fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
CitadelStationBot f1d33ec520 Automatic changelog generation for PR #5525 [ci skip] 2018-02-17 11:51:47 -06:00
LetterJayandGitHub e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework 
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
 2018-02-17 11:51:45 -06:00
CitadelStationBot 9bfe0ec64e Automatic changelog generation for PR #5548 [ci skip] 2018-02-17 11:49:51 -06:00
LetterJayandGitHub c4d5dd34a3 Merge pull request #5548 from Citadel-Station-13/upstream-merge-35705 
[MIRROR] Fixes lava burning unconstructed HE-pipes
 2018-02-17 11:49:49 -06:00
CitadelStationBot e535428bf3 Automatic changelog generation for PR #5547 [ci skip] 2018-02-17 11:49:17 -06:00
LetterJayandGitHub 3c8fd612a0 Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722 
[MIRROR] Fixes extremely thicc robots
 2018-02-17 11:49:15 -06:00
CitadelStationBot 4d882e1818 Automatic changelog generation for PR #5546 [ci skip] 2018-02-17 11:48:53 -06:00
LetterJayandGitHub 6cb37cbc3d Merge pull request #5546 from Citadel-Station-13/upstream-merge-35725 
[MIRROR] Jellypeople (and all subtypes) now can actually speak Slime, as intended
 2018-02-17 11:48:51 -06:00
LetterJayandGitHub 5745b4ada3 Merge pull request #5545 from Citadel-Station-13/upstream-merge-35736 
[MIRROR] Removes abstract shotgun from Summon Guns list
 2018-02-17 11:48:19 -06:00
LetterJayandGitHub 559ec2fcf6 Merge pull request #5543 from Citadel-Station-13/upstream-merge-35604 
[MIRROR] Refactors mech construction datums
 2018-02-17 11:47:48 -06:00
CitadelStationBot 1deb5d10f7 Automatic changelog generation for PR #5542 [ci skip] 2018-02-17 11:47:38 -06:00
LetterJayandGitHub fb7e1b1438 Merge pull request #5542 from Citadel-Station-13/upstream-merge-35735 
[MIRROR] RESISTHOT species can put out fires with their hands
 2018-02-17 11:47:35 -06:00
LetterJayandGitHub 92526a4a94 Update corpse.dm 2018-02-17 11:47:24 -06:00
LetterJayandGitHub d186b0ef0e Merge pull request #5544 from Citadel-Station-13/upstream-merge-35720 
[MIRROR] Pulling claw grammar fix
 2018-02-17 11:46:52 -06:00
CitadelStationBot 0678de0297 Fixes lava burning unconstructed HE-pipes 2018-02-17 10:14:21 -06:00
BordListianandCitadelStationBot dbdb29d913 - Makes lava not burn unconstructed heat-exhanging pipes (#35705) 2018-02-17 10:14:20 -06:00
CitadelStationBot 8d2d234e4b Fixes extremely thicc robots 2018-02-17 10:13:08 -06:00
Dax DupontandCitadelStationBot d368c42a98 Fixes extremely thicc robots (#35722) 
* Fixes extremely fat robots

* grasp
 2018-02-17 10:13:08 -06:00
CitadelStationBot 88a2ff6d62 Jellypeople (and all subtypes) now can actually speak Slime, as intended 2018-02-17 10:05:47 -06:00
vuonojenmustaturskaandCitadelStationBot 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
CitadelStationBot 6880f4030c Removes abstract shotgun from Summon Guns list 2018-02-17 10:05:39 -06:00
coiaxandCitadelStationBot 40e2685a7c Removes abstract shotgun from Summon Guns list (#35736) 
* Fixes abstract shotgun from Summon Guns list

Fixes #34962.

Looking at the old summon gun list, the comment says this
typepath was supposed to be a Bulldog.

* Removes duplicate bulldog
 2018-02-17 10:05:38 -06:00
CitadelStationBot cb9778b215 Pulling claw grammar fix 2018-02-17 10:04:26 -06:00
vuonojenmustaturskaandCitadelStationBot e4b037d6af Merge pull request #35720 from LetterN/patch-1 
Pulling claw grammar fix
 2018-02-17 10:04:26 -06:00
CitadelStationBot a861c39ce8 Refactors mech construction datums 2018-02-17 10:00:09 -06:00
vuonojenmustaturskaandCitadelStationBot c64a8a8d6b Merge pull request #35604 from ACCount12/construction_datum_refactor 
Refactors mech construction datums
 2018-02-17 10:00:09 -06:00
LetterJayandGitHub 06dd2e2aa5 Update corpse.dm 2018-02-17 09:58:42 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 7b87214309 Merge pull request #5537 from Citadel-Station-13/upstream-merge-35717 
[MIRROR] Fixes AI dating
 2018-02-17 09:56:40 -06:00
LetterJayandGitHub 582cd2fe15 Merge pull request #5536 from Citadel-Station-13/upstream-merge-35716 
[MIRROR] Fixes wet space.
 2018-02-17 09:56:32 -06:00
LetterJayandGitHub 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 4a180914d1 RESISTHOT species can put out fires with their hands 2018-02-17 09:39:29 -06:00
vuonojenmustaturskaandCitadelStationBot 22fb75d2a6 Merge pull request #35735 from coiax/fire-proof-hands 
RESISTHOT species can put out fires with their hands
 2018-02-17 09:39:29 -06:00
CitadelStationBot 88cc94089b Cleans up unused /area paths 2018-02-17 09:39:20 -06:00
vuonojenmustaturskaandCitadelStationBot 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
yoriiandCitadelStationBot 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
TankNutandCitadelStationBot a918a06478 Map spawned corpses start with their suit sensors turned off 2018-02-17 08:54:04 -06:00
CitadelStationBot 377c591024 Fixes AI dating 2018-02-17 00:48:27 -06:00
Jordan BrownandCitadelStationBot 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 BrownandCitadelStationBot 48f6e72293 Merge pull request #35716 from AnturK/slipspace 
Fixes wet space.
 2018-02-17 00:48:18 -06:00
CitadelStationBot f24cdd4043 Adds rainbow slime clusterbangs 2018-02-17 00:47:04 -06:00
BordListianandCitadelStationBot 24ab7e0a84 Adds rainbow slime clusterbangs (#35707) 
* - slime
- yes

* - Adds a volatile reaction

* - There is no escape from the standards that live within
- Can't wait for the experimentor review
 2018-02-17 00:47:03 -06:00