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

10796 Commits

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
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
Dax Dupont
caf515f204 [s] Blacklists TB grenade from experimentor. (#38095) 2018-05-27 11:41:23 -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
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
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
ShizCalev
2e8cdac9a3 Eatting fried items actually consumes the item (#38054) 
* Eatting fried items actually consumes the item

* destroy
 2018-05-27 11:40:39 -05:00
ShizCalev
786b062f61 Capitalizes CentCom (#38086) 
* Capitalized CentCom

* neediful
 2018-05-27 11:40:12 -05:00
LetterJay
69af2087aa Merge pull request #6848 from Citadel-Station-13/upstream-merge-37631 
[MIRROR] Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision
 2018-05-27 01:32:02 -05:00
LetterJay
2a56a5d0c1 Merge pull request #6873 from Citadel-Station-13/upstream-merge-38048 
[MIRROR] [s] Fixes fried items losing inhands
 2018-05-27 01:31:42 -05:00
LetterJay
e544f0fe29 Update dance_machine.dm 2018-05-26 21:40:10 -05:00
LetterJay
ec9b4ef955 Merge pull request #6902 from Citadel-Station-13/upstream-merge-38045 
[MIRROR] Security console fixes
 2018-05-26 21:39:54 -05:00
LetterJay
071165b925 Merge pull request #6909 from Citadel-Station-13/upstream-merge-37963 
[MIRROR] Unredden the input bar when the viewport is clicked
 2018-05-26 18:41:09 -05:00
LetterJay
e6128d5419 Merge pull request #6906 from Citadel-Station-13/upstream-merge-38042 
[MIRROR] Adjust antag rep values to remove chain-of-command -based bonuses
 2018-05-26 18:40:53 -05:00
LetterJay
54510e95b1 Merge pull request #6904 from Citadel-Station-13/upstream-merge-38055 
[MIRROR] Enable Goonchat ping during the lobby
 2018-05-26 18:40:25 -05:00
LetterJay
202e02750d Merge pull request #6903 from Citadel-Station-13/upstream-merge-38044 
[MIRROR] Fixes bronze spelling in girder construction
 2018-05-26 18:40:01 -05:00
LetterJay
393676aa3e Update dance_machine.dm 2018-05-26 18:39:20 -05:00
LetterJay
7caef42502 Merge pull request #6899 from Citadel-Station-13/upstream-merge-37993 
[MIRROR] Adds two saferChems for vent clogs.
 2018-05-26 18:38:19 -05:00
LetterJay
c512fe52c8 Merge pull request #6898 from Citadel-Station-13/upstream-merge-38008 
[MIRROR] Fixes some edge cases in sstimer that could cause a timer to run before it was expecting to.
 2018-05-26 18:38:07 -05:00
LetterJay
7be2b7cce5 Merge pull request #6897 from Citadel-Station-13/upstream-merge-38009 
[MIRROR] Timers on qdeleted objects is no longer supported.
 2018-05-26 18:37:46 -05:00
LetterJay
7c201df696 Merge pull request #6896 from Citadel-Station-13/upstream-merge-38014 
[MIRROR] Fixes luxury shuttle forcefields vanishing
 2018-05-26 18:37:26 -05:00
LetterJay
cfe5c7a962 Merge pull request #6895 from Citadel-Station-13/upstream-merge-38023 
[MIRROR] Fix various bugs with telekinesis
 2018-05-25 23:28:01 -05:00
LetterJay
3d57f4e360 Merge pull request #6894 from Citadel-Station-13/upstream-merge-38026 
[MIRROR] Fix frost spiders injecting a nonexistent reagent
 2018-05-25 23:03:27 -05:00
LetterJay
dd777f8ef2 Merge pull request #6893 from Citadel-Station-13/upstream-merge-38068 
[MIRROR] Fixes navbeacon access reqs
 2018-05-25 23:03:02 -05:00
LetterJay
60b1774131 Merge pull request #6892 from Citadel-Station-13/upstream-merge-38027 
[MIRROR] [s] Fix Jacob's Ladder allowing access to VR
 2018-05-25 22:52:46 -05:00
LetterJay
45dcee8f29 Merge pull request #6891 from Citadel-Station-13/upstream-merge-38047 
[MIRROR] Sync permanent admin removals to the players table immediately
 2018-05-25 22:52:27 -05:00
LetterJay
1a87aa1b33 Merge pull request #6890 from Citadel-Station-13/upstream-merge-38052 
[MIRROR] Fixes accidental empty ahelp replies
 2018-05-25 22:51:51 -05:00
LetterJay
d4d8c89fea Merge pull request #6889 from Citadel-Station-13/upstream-merge-38019 
[MIRROR] Fixes drones being able to magically sense invisible revenants
 2018-05-25 22:50:40 -05:00
LetterJay
25bd4a2d55 Merge pull request #6888 from Citadel-Station-13/upstream-merge-38017 
[MIRROR] Disallow effects from being scanned by the chameleon projector
 2018-05-25 22:50:25 -05:00
LetterJay
79584bd08a Merge pull request #6887 from Citadel-Station-13/upstream-merge-37971 
[MIRROR] Fix template preview being invisible on space turfs
 2018-05-25 22:50:11 -05:00