shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,230 Commits 5 Branches 0 Tags
8d8db8d2fef2a57cdaa07376388494f18fd893bd
Commit Graph

17230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay 8d8db8d2fe Merge pull request #6977 from Citadel-Station-13/upstream-merge-38091 
[MIRROR] EMPs no longer pulse internal silicon wires
 2018-06-02 07:32:11 -05:00
CitadelStationBot 4ccdf2d72d Automatic changelog generation for PR #6976 [ci skip] 2018-06-02 07:31:55 -05:00
LetterJay 3f85ba3724 Merge pull request #6976 from Citadel-Station-13/upstream-merge-38210 
[MIRROR] Fix reagents being lost when vomit piles combine
 2018-06-02 07:31:53 -05:00
CitadelStationBot dbf0329b30 Automatic changelog generation for PR #6975 [ci skip] 2018-06-02 07:31:03 -05:00
LetterJay 652b973810 Merge pull request #6975 from Citadel-Station-13/upstream-merge-38161 
[MIRROR] Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo
 2018-06-02 07:31:01 -05:00
CitadelStationBot 89deed21ec Automatic changelog generation for PR #6974 [ci skip] 2018-06-02 07:29:40 -05:00
LetterJay 6c5283be9f Merge pull request #6974 from Citadel-Station-13/upstream-merge-38198 
[MIRROR] Blacklist projectile effects from chasms
 2018-06-02 07:29:38 -05:00
CitadelStationBot df08e83215 Automatic changelog generation for PR #6973 [ci skip] 2018-06-02 07:29:19 -05:00
LetterJay 5646dd794b Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180 
[MIRROR] Fix family heirloom being lost on cloning
 2018-06-02 07:29:17 -05:00
CitadelStationBot 7c597ea289 Automatic changelog generation for PR #6972 [ci skip] 2018-06-02 07:28:58 -05:00
LetterJay 3af17b9f7c Merge pull request #6972 from Citadel-Station-13/upstream-merge-38185 
[MIRROR] Set cult floor effects to be on the floor plane
 2018-06-02 07:28:56 -05:00
LetterJay 91351e1f1f Merge pull request #6970 from Citadel-Station-13/upstream-merge-38172 
[MIRROR] allows changing the rank of players in the playerpanel
 2018-06-02 07:28:31 -05:00
CitadelStationBot ef81bb2f6d Automatic changelog generation for PR #6969 [ci skip] 2018-06-02 07:28:10 -05:00
LetterJay 321df15afd Merge pull request #6969 from Citadel-Station-13/upstream-merge-38195 
[MIRROR] Fix infinite soapstone uses exploit
 2018-06-02 07:28:08 -05:00
CitadelStationBot ede4c78bcd Automatic changelog generation for PR #6963 [ci skip] 2018-06-02 07:23:45 -05:00
LetterJay 97a31c283b Merge pull request #6963 from Citadel-Station-13/upstream-merge-38158 
[MIRROR] Fix: Cyborgs can now use defibs with other modules equipped
 2018-06-02 07:23:42 -05:00
CitadelStationBot 0ad5678894 Automatic changelog generation for PR #6966 [ci skip] 2018-06-02 07:22:23 -05:00
LetterJay d751cb619a Merge pull request #6966 from Citadel-Station-13/upstream-merge-38191 
[MIRROR] Stock parts sorter now use get_parts_rating
 2018-06-02 07:22:21 -05:00
LetterJay 25dbeeac80 Merge pull request #6959 from Citadel-Station-13/upstream-merge-38164 
[MIRROR] Corrects bronze table's name
 2018-06-02 07:21:15 -05:00
CitadelStationBot d2fd75caa0 Automatic changelog generation for PR #6958 [ci skip] 2018-06-02 07:20:44 -05:00
LetterJay eeb336e635 Merge pull request #6958 from Citadel-Station-13/upstream-merge-38159 
[MIRROR] Arrest diagonal movement when force-moved
 2018-06-02 07:20:42 -05:00
LetterJay 228a88e442 Merge pull request #6957 from Citadel-Station-13/upstream-merge-38160 
[MIRROR] Fix rank changing with legacy only rank loading
 2018-06-02 07:20:24 -05:00
LetterJay d05e01e5a5 Merge pull request #6956 from Citadel-Station-13/upstream-merge-38201 
[MIRROR] [s] Remove datum/action/generic
 2018-06-02 07:20:04 -05:00
CitadelStationBot 6646ef854f Automatic changelog generation for PR #6964 [ci skip] 2018-06-02 06:13:29 -05:00
LetterJay 249ec8d315 Merge pull request #6964 from Citadel-Station-13/upstream-merge-37695 
[MIRROR] AI Multicamera mode
 2018-06-02 06:13:27 -05:00
LetterJay 3b498f2288 map fix 2018-06-02 05:41:31 -05:00
letterjay aa961ec4bb EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
kevinz000 308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -05:00
letterjay 73e6a989bd Fix reagents being lost when vomit piles combine 2018-06-01 09:58:50 -05:00
Jordan Brown 6060af1c49 Merge pull request #38210 from AutomaticFrenzy/patch/by-vomit-combined 
Fix reagents being lost when vomit piles combine
 2018-06-01 09:58:50 -05:00
letterjay 91ab28ec67 Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo 2018-06-01 09:53:33 -05:00
JStheguy a3a0a49b5d Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo (#38161) 
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony

* does sprite things to lighters and cigar cases

* darkened cigar case interiors

* tweaks lighter flames
 2018-06-01 09:53:33 -05:00
letterjay 2e2e61ce6f Blacklist projectile effects from chasms 2018-06-01 09:52:21 -05:00
Jordan Brown 948a128a72 Merge pull request #38198 from AutomaticFrenzy/patch/chasm-beams 
Blacklist projectile effects from chasms
 2018-06-01 09:52:21 -05:00
letterjay 953ba7b35a Fix family heirloom being lost on cloning 2018-06-01 09:51:08 -05:00
Jordan Brown f2124aa3cf Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone 
Fix family heirloom being lost on cloning
 2018-06-01 09:51:08 -05:00
letterjay 4f720c7168 Set cult floor effects to be on the floor plane 2018-06-01 09:50:58 -05:00
Jordan Brown 876e8ec713 Merge pull request #38185 from AutomaticFrenzy/patch/cult-floors 
Set cult floor effects to be on the floor plane
 2018-06-01 09:50:58 -05:00
letterjay b147bf796d allows changing the rank of players in the playerpanel 2018-06-01 08:26:25 -05:00
Nich 3b6e5236bf allows changing the rank of players in the playerpanel (#38172) 
* allows changing the rank of players in the playerpanel

* Update permissionedit.dm

* Update permissionedit.dm
 2018-06-01 08:26:25 -05:00
letterjay 2611945379 Fix infinite soapstone uses exploit 2018-06-01 08:13:54 -05:00
Nich 6d56a629f7 Fix infinite soapstone uses exploit (#38195) 2018-06-01 08:13:54 -05:00
letterjay 21fe3cd55e Stock parts sorter now use get_parts_rating 2018-06-01 04:15:02 -05:00
Dax Dupont 7dd53d445e Stock parts sorter now use get_parts_rating (#38191) 2018-06-01 04:15:02 -05:00
letterjay 7c34029e78 AI Multicamera mode 2018-05-31 22:41:48 -05:00
Cruix 9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
letterjay b44c99eacb Fix: Cyborgs can now use defibs with other modules equipped 2018-05-31 22:41:40 -05:00
CitrusGender f4441c4836 Fix: Cyborgs can now use defibs with other modules equipped (#38158) 
* Adds a check to see if the user is a cyborg before referring to the offhand.

* Update twohanded.dm

* actually this is a bit more modular

* Update twohanded.dm

* Update twohanded.dm
 2018-05-31 22:41:40 -05:00
letterjay d439550c55 Corrects bronze table's name 2018-05-31 22:41:02 -05:00
ShizCalev 4452dc4629 Corrects bronze floor & table's name (#38164) 2018-05-31 22:41:01 -05:00