shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,214 Commits 5 Branches 0 Tags
5646dd794bb56bb89fab9acb03fb0c11d2e1f1f9
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 953ba7b35a Fix family heirloom being lost on cloning 2018-06-01 09:51:08 -05:00
Jordan Brownandletterjay 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 Brownandletterjay 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
Nichandletterjay 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
Nichandletterjay 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 Dupontandletterjay 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
Cruixandletterjay 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
CitrusGenderandletterjay 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
ShizCalevandletterjay 4452dc4629 Corrects bronze floor & table's name (#38164) 2018-05-31 22:41:01 -05:00
letterjay fddcfa07e3 Arrest diagonal movement when force-moved 2018-05-31 22:40:50 -05:00
orangesandletterjay a10abadec8 Merge pull request #38159 from AutomaticFrenzy/patch/diagonalley 
Arrest diagonal movement when force-moved
 2018-05-31 22:40:49 -05:00
letterjay abee85bb65 Fix rank changing with legacy only rank loading 2018-05-31 22:40:41 -05:00
Jordieandletterjay bc671f35f8 Fix rank changing with legacy only rank loading (#38160) 
Legacy only rank loading would block any permanent rank changing.
Now only blocks adding a new rank to the db.
 2018-05-31 22:40:40 -05:00
letterjay b5b9338975 [s] Remove datum/action/generic 2018-05-31 22:40:18 -05:00
Tad Hardestyandletterjay ecd16515c5 Remove datum/action/generic (#38201) 2018-05-31 22:40:17 -05:00
deathride58andGitHub 340c6d2e83 Merge pull request #6824 from Citadel-Station-13/kevinz000-patch-1 
Roll Dice Verb
 2018-06-01 01:46:14 +00:00
CitadelStationBot 31030bc695 Automatic changelog generation for PR #6952 [ci skip] 2018-05-31 18:07:06 -05:00
deathride58andkevinz000 16b069158c re-enables lavaland lighting (#6952) 2018-05-31 16:07:04 -07:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
CitadelStationBot b6e608cb4c Automatic changelog generation for PR #6925 [ci skip] 2018-05-27 21:32:11 -05:00
CitadelStationBotandkevinz000 1ce820d2ed [MIRROR] Adds action features to the metastation beerkeg-nukes (#6925) 
* Adds action features to the metastation beerkeg-nukes (#38084)

* Hottomonkulu Pyynö mos kyren hepität. Nerse marentaat aluturnate.

* Masennoo sum keuron väkeltäät vassem Pyynö er borsalitaat Urmas.

* Tarnatat kuulor ustanitat vernes heuremasso seurutik Pyynör kanervo mahkatosimos. Atti ivakhan nutiv.

* Surmustulet nasnas kyhille nes viuhuntut sepelitör arnisansatin.

* Adds action features to the metastation beerkeg-nukes

* Test 1

* Test 2

* Test 3
 2018-05-27 19:32:09 -07:00
CitadelStationBotandkevinz000 d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884) 
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
 2018-05-27 19:27:56 -07:00
CitadelStationBotandkevinz000 b24ff24696 [MIRROR] sql changelog changes ping the host (#6549) 
* sql changelog changes ping the host

* Update CODEOWNERS
 2018-05-27 17:26:56 -07:00
CitadelStationBot 6423ece36f Automatic changelog generation for PR #6850 [ci skip] 2018-05-27 19:26:38 -05:00
CitadelStationBotandkevinz000 8502508c21 [MIRROR] Anomalies can now be deconstructed for techwebs for 10k points (#6850) 
* Anomalies can now be deconstructed for techwebs for 10k points

* Update research.dm
 2018-05-27 17:26:36 -07:00