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

239 Commits

Author SHA1 Message Date
CitadelStationBot
03a22ca16d [MIRROR] Transit space refactor (#7130) 
* Transit space refactor

* Update bitfields.dm
 2018-06-18 11:51:02 -07:00
CitrusGender
ba6c5324f0 Fixes the Blob being banished to the shadow realm (#38461) 
* blob now respawns like nuke disk if off z-level

* can't do it, sorry nak

* space

* muh codebaby

* Revert "CitrusGender my friend, don't you start away uneasy"
 2018-06-18 09:37:35 -05:00
LetterJay
d4684b5204 Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424 
[MIRROR] Removes doubled iaa definition.
 2018-06-12 08:08:39 -05:00
Jordan Brown
adf4cad9ea Merge pull request #38424 from AnturK/iaafixup 
Removes doubled iaa definition.
 2018-06-11 22:30:26 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
AnturK
6d8e6e072e Fixes nuke exploding instantly. (#38417) 2018-06-11 09:16:47 -05:00
CitadelStationBot
8413eb2888 [MIRROR] Squashes traitors under one path (#7049) 
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
 2018-06-10 12:30:00 -07:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58
bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116 
[MIRROR] Refactor machinery to default to being anchored
 2018-06-05 23:37:20 +00:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
81Denton
a93d92569f Stop swarmers from attacking field gens/turret covers (#38283) 2018-06-05 13:17:12 -05:00
LetterJay
8bc642c6bd Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220 
[MIRROR] Fixes pocket items being deleted when monkeyizing
 2018-06-03 16:19:36 -05:00
LetterJay
73d1abed5c Merge pull request #6987 from Citadel-Station-13/upstream-merge-38199 
[MIRROR] fixes a locate and adds job checks to download objective
 2018-06-03 10:42:27 -05:00
LetterJay
7b7420dec6 Merge pull request #6986 from Citadel-Station-13/upstream-merge-38250 
[MIRROR] [s]Fixes bloodcult exploit
 2018-06-03 10:42:16 -05:00
ShizCalev
67841c3f19 Fixes pocket items being deleted when monkeyizing (#38220) 2018-06-03 09:04:08 -05:00
Nich
b38f42f989 Fixes a locate and adds job checks to download objective (#38199) 2018-06-03 09:03:23 -05:00
kevinz000
217dfc0d53 Fixes exploit (#38250) 2018-06-03 09:03:15 -05:00
Tad Hardesty
95bbfb29d1 Fix mecha mouse pointer issues (#38213) 
* Fix mecha mouse pointer issues

* Migrate ranged ability mouse pointers to new system
 2018-06-03 09:03:06 -05:00
LetterJay
5bf3bd761d Merge pull request #6961 from Citadel-Station-13/upstream-merge-38175 
[MIRROR] Removes drone overlays and the associated code
 2018-06-02 07:45:00 -05:00
LetterJay
55720bd218 Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170 
[MIRROR] Fixed the clockwork helmet not dropping to the ground when used by a non-clock cultist like the other clock armor pieces do.
 2018-06-02 07:32:31 -05:00
Jordan Brown
5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -05:00
theo2003
d45724f12b Fixed the clockwork helmet so it drops to the ground when used by a non-clock cultist like the other clock armor does. 2018-06-01 10:20:40 -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
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05:00
vuonojenmustaturska
7b6c75df28 Removes drone overlays and the associated code (#38175) 
* Remove drone overlays

4* animated multidir overlays per mob is a bit much

* to the orbit with you too
 2018-05-31 22:41:21 -05: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
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
vuonojenmustaturska
10327267bb Fixes drones being able to magically sense invisible revenants (#38019) 
* revfix

* Update revenant.dm
 2018-05-25 08:08:57 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
 2018-05-22 07:18:34 -05:00
deathride58
9afa6b9290 Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883 
[MIRROR] Fixes soulstone runtime
 2018-05-22 02:30:01 +00:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Nich
177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
ShizCalev
49bf67ed1d Updates BYOND links to use HTTPS (#37918) 
* Updates BYOND links to use HTTPS

* revert

* if -> If
 2018-05-20 15:31:28 -05:00
LetterJay
19b8053159 Update soulstone.dm 2018-05-20 02:33:33 -05:00
LetterJay
33a6d7544f Merge pull request #6800 from Citadel-Station-13/upstream-merge-37892 
[MIRROR] Fixes changeling runtime after ghosting
 2018-05-19 09:15:03 -05:00
LetterJay
88ad927838 Merge pull request #6772 from Citadel-Station-13/upstream-merge-37870 
[MIRROR] Fixes decon message pronouns
 2018-05-19 09:10:29 -05:00