shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,820 Commits 5 Branches 0 Tags
b8d6bc53cf2e6affe4e57cdcbf67c3fb8d11a0f3
Commit Graph

90 Commits

Author SHA1 Message Date
oranges
11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle 
Fixed cameras holding up the arrival shuttle
 2018-03-17 07:53:44 -05:00
CitadelStationBot
13709a7d34 [MIRROR] Simple xeno antagonist (#5961) 
* Simple xeno antagonist

* Merge pull request #36397 from AnturK/xeno_antag

Simple xeno antagonist
 2018-03-17 05:23:21 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
c91006c27f [MIRROR] Create ERT refactor (#5924) 
* Create ERT refactor (#36321)

cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl

* Create ERT refactor
 2018-03-12 07:30:03 -05:00
CitadelStationBot
64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913) 
* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
 2018-03-12 07:01:54 -05:00
ExcessiveUseOfCobblestone
236effbc5b Holy water is trivial against Eminence once Daddy arrives (#36285) 
* Update _eminence.dm

* cleanup daddio

* Xhuis if I see another spaced if...
 2018-03-10 14:53:30 -06:00
CitadelStationBot
75160fb5b0 [MIRROR] Slightly optimizes adjust_clockwork_power (#5884) 
* Slightly optimizes adjust_clockwork_power (#36250)

* optimizations

* Update power_helpers.dm

* Slightly optimizes adjust_clockwork_power
 2018-03-10 07:33:22 -06:00
deathride58
b587eb32c0 Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254 
[MIRROR] Disables advanced shuttle navigation consoles during nuclear war ops
 2018-03-09 22:10:22 +00:00
deathride58
6d91d7d438 fixes bad mirror 2018-03-09 15:58:25 -05:00
deathride58
936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
deathride58
c615d9e6a0 Merge pull request #5870 from Citadel-Station-13/upstream-merge-36252 
[MIRROR] Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
 2018-03-09 18:40:24 +00:00
deathride58
78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer 
Reverts crybaby inducer also does the sync things
 2018-03-09 18:36:42 +00:00
vuonojenmustaturska
1995f00032 Merge pull request #36252 from kevinz000/patch-463 
Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
 2018-03-09 11:04:28 -06:00
vuonojenmustaturska
423302ac3c Merge pull request #36217 from Cruix/disease_freemove 
Sentient diseases get 2 minutes to select their initial host
 2018-03-08 22:42:57 -06:00
Qustinnus
a96a28f3d6 [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] 2018-03-07 20:49:25 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788) 
* Clean up all sorts of crap, mostly defines

* fixes compile errors
 2018-03-05 13:23:28 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710) 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
 2018-03-05 12:34:01 -06:00
CitadelStationBot
f7ade14cf7 [MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723) 
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
 2018-02-27 05:03:07 -06:00
deathride58
509148f7f3 Merge pull request #5713 from Citadel-Station-13/upstream-merge-35930 
[MIRROR] Blood Cult Conversion Fixes
 2018-02-26 00:28:29 +00:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665) 
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
 2018-02-25 18:11:48 -06:00
Robustin
6c8ee4f99e Blood Cult Conversion Fixes (#35930) 
* Cult Fixes

* woops
 2018-02-25 17:30:57 -06:00
LetterJay
d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639 
[MIRROR] Refactors anti-magic into a component
 2018-02-25 16:59:38 -06:00
deathride58
44d8fd6085 Merge pull request #5705 from Citadel-Station-13/upstream-merge-35744 
[MIRROR] Refactors butchering to a component - item-based butchering effectiveness, speed, and chances
 2018-02-25 21:41:38 +00:00
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744) 
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
 2018-02-25 14:50:29 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
XDTM
bd6e8f0bbb Adds limitations to brain traumas (#35938) 
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
 2018-02-25 11:01:15 -06:00
CitadelStationBot
58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634) 
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
 2018-02-24 09:35:48 -06:00
CitadelStationBot
b7015c379a [MIRROR] Cleans up some time stuff with DisplayTimeText (#5685) 
* Cleans up some time stuff with DisplayTimeText

* Update hot_potato.dm
 2018-02-24 07:02:45 -06:00
LetterJay
6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775 
[MIRROR] [READY]Randomized Station Time + Night Shifts
 2018-02-24 00:24:47 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674) 
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
 2018-02-23 17:42:57 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
CitadelStationBot
05fc69289a [MIRROR] Update Ninja welcome text (#5651) 
* Updates Ninja welcome text (#35863)

* Update Ninja welcome text
 2018-02-22 01:30:14 -06:00
CitadelStationBot
fc2605aaeb [MIRROR] Marauder limit fixed (#5645) 
* Merge pull request #35593 from Robustin/marauderfix2

Marauder limit fixed

* Marauder limit fixed
 2018-02-21 19:45:48 -06:00
deathride58
4608244c87 Update fakedeath.dm 2018-02-21 13:06:07 -05:00
Jordan Brown
bc2f2a9728 [READY]Randomized Station Time + Night Shifts 2018-02-21 12:02:28 -06:00
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841) 
* uses time helpers, tweaks santa/shuttle loan times

* hourS
 2018-02-21 11:38:26 -06:00
ShizCalev
d2ba2bf0c1 [s] Cameranet fixes (#35733) 2018-02-21 07:31:27 -06:00
Cruix
558b87ce65 Fixed instant summon behavior with simple animals (#35780) 
Removed hand slots from lots of things that should not have them
 2018-02-19 22:08:01 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590) 
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
 2018-02-19 10:48:11 -06:00
CitadelStationBot
773169564c [MIRROR] Fixes invincible blobs and blob nodes producing tiles after its death (#5580) 
* Fixes invincible blobs and blob nodes producing tiles after its death (#35706)

* Fixes invinciblobs

* who put that there in the first place?!

* Update theblob.dm

* Fixes invincible blobs and blob nodes producing tiles after its death
 2018-02-18 19:30:19 -06:00
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339 
[MIRROR] Support stations with multiple z-levels
 2018-02-17 21:24:48 +00:00
deathride58
6a7d414fdf fixes compiling errors hopefully 2018-02-17 15:57:34 -05:00
deathride58
fb65a98117 Merge pull request #5516 from Citadel-Station-13/upstream-merge-35668 
[MIRROR] Quote the armor lists
 2018-02-17 19:29:50 +00:00
Jordan Brown
cbb11e81e6 Merge pull request #35717 from AnturK/robolove 
Fixes AI dating
 2018-02-17 00:48:26 -06:00
AnturK
3e12e1b2f6 Some antag fixes. (#35690) 
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
 2018-02-16 10:35:55 -06:00
LetterJay
e0cb508207 Update shield.dm 2018-02-16 07:54:48 -06:00
AnturK
993f15a415 Converting more auto_custom antagonists. (#35484) 
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
 2018-02-16 00:45:20 -06:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00