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

17175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
deathride58
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
deathride58
16b069158c re-enables lavaland lighting (#6952) 2018-05-31 16:07:04 -07: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
b6e608cb4c Automatic changelog generation for PR #6925 [ci skip] 2018-05-27 21:32:11 -05: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
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
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
5c2131c5ae Automatic changelog generation for PR #6811 [ci skip] 2018-05-27 19:26:00 -05: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
876625d230 Automatic changelog generation for PR #6818 [ci skip] 2018-05-27 19:25:20 -05: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
f6aa35f76e Automatic changelog generation for PR #6922 [ci skip] 2018-05-27 19:21:03 -05: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
8a5f07dc73 Automatic changelog generation for PR #6851 [ci skip] 2018-05-27 19:20:40 -05: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
CitadelStationBot
35ecd13db3 Automatic changelog generation for PR #6092 [ci skip] 2018-05-27 19:18:42 -05: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
dae3945580 Automatic changelog generation for PR #6926 [ci skip] 2018-05-27 19:16:45 -05: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
eeb199815d Automatic changelog generation for PR #6927 [ci skip] 2018-05-27 19:16:17 -05: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
CitadelStationBot
441fb3de9d Automatic changelog generation for PR #6920 [ci skip] 2018-05-27 14:42:49 -05: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
CitadelStationBot
1b9aa0e612 Automatic changelog generation for PR #6919 [ci skip] 2018-05-27 14:42:34 -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
CitadelStationBot
f4d36b3c87 Automatic changelog generation for PR #6918 [ci skip] 2018-05-27 14:41:59 -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
CitadelStationBot
e04d89e57c Automatic changelog generation for PR #6915 [ci skip] 2018-05-27 14:41:21 -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
CitadelStationBot
cea9ddbf86 Automatic changelog generation for PR #6901 [ci skip] 2018-05-27 14:39:20 -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
LetterJay
f636b4be4d Merge pull request #6913 from Citadel-Station-13/upstream-merge-38080 
[MIRROR] Fix typo in Python dependencies file
 2018-05-27 14:38:29 -05:00
LetterJay
dbc8033f16 Merge pull request #6911 from Citadel-Station-13/upstream-merge-38086 
[MIRROR] Capitalizes CentCom
 2018-05-27 14:38:01 -05:00
letterjay
50eb853ba7 Allow running into space diagonally 2018-05-27 11:41:31 -05:00
Tad Hardesty
a009da5d7a Allow into space diagonally (#38066) 2018-05-27 11:41:31 -05:00
letterjay
42be2d96e9 [s] Blacklists TB grenade from experimentor. 2018-05-27 11:41:23 -05:00
Dax Dupont
caf515f204 [s] Blacklists TB grenade from experimentor. (#38095) 2018-05-27 11:41:23 -05:00
letterjay
9149b9a7a2 Gun overlays 2: Electric boogaloo. 2018-05-27 11:41:15 -05:00
Dax Dupont
74932ddce0 Gun overlays 2: Electric boogaloo. (#38003) 
* Reduces selfcharge gun processing/icon work

* More efficient gun overlays, adds old_ratio var

* oh my god it was calling the egun's update_icon?

* percent proc

* Attachment overlay overhaul

* Cut overlays in egun update

* ebow 1000% better overlay management

* Update gun.dm

* Pointless check

* Giving KA and children consistent icon behavior

* Update kinetic_accelerator.dm

* Fixed

* ..() readded

* ..() readded

* ..() readded

* Antur didnt catch this one heck

* Because confusing vars are apparently more maintainable

* Gun overlays 2: Electric boogaloo

* another one

* Chameleon guns are removed

* tentacles everywhere
 2018-05-27 11:41:14 -05:00
letterjay
a4abd0c9df Fixes backslot not counting towards assess_threat 2018-05-27 11:41:06 -05:00
ShizCalev
69dff942ce Fixes backslot not counting towards assess_threat (#38046) 
* Fixes backslot not counting towards assess_threat

* fixed

* Cleanup & commentary
 2018-05-27 11:41:06 -05:00
letterjay
5f59c6fa03 Ports gloves of the north star from Hippie 2018-05-27 11:40:47 -05:00
GuyonBroadway
0082b0f2c0 Ports gloves of the north star from Hippie (#37864) 
* Ports gloves of the north star from Hippie

* Doing a white line

* adds customiseable warcry and sprites by Notamaniac

* star with a capital S

* Nitpick grammar
 2018-05-27 11:40:47 -05:00