shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,192 Commits 5 Branches 0 Tags
25dbeeac805f98aefd15158477fc60476a913182
Commit Graph
17192 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
CitadelStationBot 5c2131c5ae Automatic changelog generation for PR #6811 [ci skip] 2018-05-27 19:26:00 -05:00
CitadelStationBotandkevinz000 5909c7c639 [MIRROR] Changes default button for BoH confirmation prompt (#6811) 
* Changes default button for BoH confirmation prompt

* Update bag_of_holding.dm
 2018-05-27 17:25:58 -07:00
CitadelStationBot 876625d230 Automatic changelog generation for PR #6818 [ci skip] 2018-05-27 19:25:20 -05:00
CitadelStationBotandkevinz000 7bb6bc8dd3 [MIRROR] HoP/QM have access to vault (#6818) 
* Vault Access for QM (#37880)

* HoP/QM have access to vault

* Update captain.dm
 2018-05-27 17:25:18 -07:00
CitadelStationBot f6aa35f76e Automatic changelog generation for PR #6922 [ci skip] 2018-05-27 19:21:03 -05:00
CitadelStationBotandkevinz000 63dc6a64a9 [MIRROR] Those footprints are... moving? [Chameleon Proj will let you scan decals] (#6922) 
* Those footprints are... moving? [Chameleon Proj will let you scan decals] (#38071)

* Those footprints are... moving? [Chameleon Proj will let you scan decals]
 2018-05-27 17:21:01 -07:00
CitadelStationBot 8a5f07dc73 Automatic changelog generation for PR #6851 [ci skip] 2018-05-27 19:20:40 -05:00
CitadelStationBotandkevinz000 c2f9ff1358 [MIRROR] Anomaly Neutralizer (#6851) 
* Anomaly Neutralizer

* Update all_nodes.dm
 2018-05-27 17:20:37 -07:00
kevinz000andGitHub 15085c732f Update admin_verbs.dm 2018-05-27 17:19:48 -07:00
CitadelStationBot 35ecd13db3 Automatic changelog generation for PR #6092 [ci skip] 2018-05-27 19:18:42 -05:00
deathride58andkevinz000 6ac830a123 Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092) 
* makes use of 512's filters, adds combat mode toggle component signals, and more

* Update phantomthief.dm

* Update living.dm
 2018-05-27 17:18:40 -07:00
CitadelStationBot dae3945580 Automatic changelog generation for PR #6926 [ci skip] 2018-05-27 19:16:45 -05:00
CitadelStationBotandkevinz000 270d71d095 [MIRROR] New Trait: Drunken Resilience (#6926) 
* New Trait: Drunken Resilience (#38076)

* drunk healing

* balance, bugfix

* more consistent wording

* removed random chance and tweaked values

* rounding values

* 0 to FALSE, slightly lowered top values

* New Trait: Drunken Resilience
 2018-05-27 17:16:43 -07:00
CitadelStationBot eeb199815d Automatic changelog generation for PR #6927 [ci skip] 2018-05-27 19:16:17 -05:00
CitadelStationBotandkevinz000 fed04c4fba [MIRROR] Borgs can now toggle rad collectors (#6927) 
* Borgs can now toggle rad collectors (#38100)

* Borgs can now toggle rad collectors
 2018-05-27 17:16:15 -07:00
CitadelStationBot 441fb3de9d Automatic changelog generation for PR #6920 [ci skip] 2018-05-27 14:42:49 -05:00
LetterJayandGitHub 0bc1c309d7 Merge pull request #6920 from Citadel-Station-13/upstream-merge-38066 
[MIRROR] Allow running into space diagonally
 2018-05-27 14:42:47 -05:00
CitadelStationBot 1b9aa0e612 Automatic changelog generation for PR #6919 [ci skip] 2018-05-27 14:42:34 -05:00
LetterJayandGitHub b6dabb1640 Merge pull request #6919 from Citadel-Station-13/upstream-merge-38095 
[MIRROR] [s] Blacklists TB grenade from experimentor.
 2018-05-27 14:42:32 -05:00
CitadelStationBot f4d36b3c87 Automatic changelog generation for PR #6918 [ci skip] 2018-05-27 14:41:59 -05:00
LetterJayandGitHub 5fff5e3968 Merge pull request #6918 from Citadel-Station-13/upstream-merge-38003 
[MIRROR] Gun overlays 2: Electric boogaloo.
 2018-05-27 14:41:57 -05:00
LetterJayandGitHub fb58f70665 Merge pull request #6917 from Citadel-Station-13/upstream-merge-38046 
[MIRROR] Fixes backslot not counting towards assess_threat
 2018-05-27 14:41:36 -05:00