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

10824 Commits

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
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
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
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
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
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
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
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
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
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
kevinz000
308a8f16b7 EMPs no longer pulse internal silicon wires 2018-06-01 10:19:28 -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
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
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
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
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
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
Nich
6d56a629f7 Fix infinite soapstone uses exploit (#38195) 2018-06-01 08:13:54 -05:00
Dax Dupont
7dd53d445e Stock parts sorter now use get_parts_rating (#38191) 2018-06-01 04:15:02 -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
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
ShizCalev
4452dc4629 Corrects bronze floor & table's name (#38164) 2018-05-31 22:41:01 -05:00
oranges
a10abadec8 Merge pull request #38159 from AutomaticFrenzy/patch/diagonalley 
Arrest diagonal movement when force-moved
 2018-05-31 22:40:49 -05:00
Jordie
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
Tad Hardesty
ecd16515c5 Remove datum/action/generic (#38201) 2018-05-31 22:40:17 -05:00
deathride58
340c6d2e83 Merge pull request #6824 from Citadel-Station-13/kevinz000-patch-1 
Roll Dice Verb
 2018-06-01 01:46:14 +00:00
deathride58
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
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
CitadelStationBot
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
CitadelStationBot
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
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
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
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
c2f9ff1358 [MIRROR] Anomaly Neutralizer (#6851) 
* Anomaly Neutralizer

* Update all_nodes.dm
 2018-05-27 17:20:37 -07:00
kevinz000
15085c732f Update admin_verbs.dm 2018-05-27 17:19:48 -07:00
deathride58
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
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
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
0cf88041e0 Merge pull request #6915 from Citadel-Station-13/upstream-merge-37864 
[MIRROR] Ports gloves of the north star from Hippie
 2018-05-27 14:41:19 -05:00
LetterJay
761035b391 Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960 
[MIRROR] Fix some inconsistencies relating to resting
 2018-05-27 14:39:18 -05:00
LetterJay
42fa4e36d5 Merge pull request #6914 from Citadel-Station-13/upstream-merge-38054 
[MIRROR] Eatting fried items actually consumes the item
 2018-05-27 14:38:53 -05:00
Tad Hardesty
a009da5d7a Allow into space diagonally (#38066) 2018-05-27 11:41:31 -05:00