shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,305 Commits 5 Branches 0 Tags
e7641dd004bd562663d6481cdf0a42a49467e7d3
Commit Graph
7537 Commits
Author SHA1 Message Date
orangesandCitadelStationBot a958de3d96 Fixes assistants spawning naked 2017-12-29 17:11:05 -06:00
ShizCalevandCitadelStationBot 0c84651ec4 white and rainbow 2017-12-29 13:45:25 -06:00
Tad HardestyandCitadelStationBot 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
Jordan BrownandCitadelStationBot d38a4a2aa5 Merge pull request #33905 from ShizCalev/jumpsuit-fix 
Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit
 2017-12-29 10:10:30 -06:00
MoreRobustThanYouandCitadelStationBot 459d4f35c7 Monkeymode fixes (#33796) 
* Monkey fixes

* Update say.dm
 2017-12-29 10:08:17 -06:00
Jordan BrownandCitadelStationBot 8059894d7d Merge pull request #33903 from AnturK/pilot-fixes 
Fixes mobs targeting from inside things.
 2017-12-29 10:01:57 -06:00
Jordan BrownandCitadelStationBot 0b9ffdd3e3 Prevent infinite loops in orbit checks 2017-12-29 10:00:44 -06:00
LetterJayandGitHub a56882556b Update _eminence.dm 2017-12-29 07:36:03 -06:00
LetterJayandGitHub a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJayandGitHub 6d52395643 Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899 
[MIRROR] Fixes air alarm contaminated mode
 2017-12-29 06:48:09 -06:00
LetterJayandGitHub e17f9fdc07 Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895 
[MIRROR] Corrects abductor uncuffing message
 2017-12-29 06:47:56 -06:00
LetterJayandGitHub 464edc7699 Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896 
[MIRROR] Fixes apple/banana/potato juicing
 2017-12-29 06:30:04 -06:00
LetterJayandGitHub 0bfd05e668 Merge pull request #4584 from Citadel-Station-13/upstream-merge-33857 
[MIRROR] Increases research point income by 33% (APPROVED BY KORPHAERON)
 2017-12-29 06:26:30 -06:00
LetterJayandGitHub 80ce187d3d Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873 
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
 2017-12-29 06:26:06 -06:00
LetterJayandGitHub b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882 
[MIRROR] Spell action buttons finally fixed
 2017-12-29 06:25:54 -06:00
LetterJayandGitHub 71a51528c3 Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847 
[MIRROR] Adds colour shift to timestop
 2017-12-29 06:25:41 -06:00
LetterJayandGitHub 72ab9444c1 Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876 
[MIRROR] Cleans up survivor counting tiny bit
 2017-12-29 06:25:11 -06:00
LetterJayandGitHub 9d7dc29efc Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874 
[MIRROR] CTF flags are no longer locked to CTF.
 2017-12-29 06:24:57 -06:00
LetterJayandGitHub cbc43aeacf Merge pull request #4576 from Citadel-Station-13/upstream-merge-33875 
[MIRROR] Makes default admin websound volume work again.
 2017-12-29 06:24:42 -06:00
LetterJayandGitHub 79e9e039a8 Merge pull request #4575 from Citadel-Station-13/upstream-merge-33878 
[MIRROR] Fixes ghost light not moving while orbiting
 2017-12-29 06:24:21 -06:00
LetterJayandGitHub 0f328e22b2 Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558 
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
 2017-12-29 06:24:09 -06:00
LetterJayandGitHub b13d4dd721 Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807 
[MIRROR] Made atoms not smooth with shuttles
 2017-12-29 06:23:12 -06:00
LetterJayandGitHub 93914f2a31 Merge pull request #4571 from Citadel-Station-13/upstream-merge-33902 
[MIRROR] Fixes admin fingerprintslast
 2017-12-29 06:23:01 -06:00
LetterJayandGitHub f093bb8fec Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856 
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
 2017-12-29 06:22:35 -06:00
LetterJayandGitHub 3c204c0125 Merge pull request #4569 from Citadel-Station-13/upstream-merge-33867 
[MIRROR] Fixes ethanol + book reaction message
 2017-12-29 06:22:26 -06:00
LetterJayandGitHub bbaee9f3d7 Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880 
[MIRROR] Fixes wall CanPass
 2017-12-29 06:22:13 -06:00
LetterJay c7db4e8310 also syncs a bunch of shit 2017-12-29 04:12:43 -06:00
YPOQandCitadelStationBot a41a508475 Fixes air alarm contaminated mode (#33899) 
* Fixes air alarm contaminated mode

* set_filters, paths instead of ids

* Readds gasid2path call
 2017-12-29 02:57:42 -06:00
XDTMandCitadelStationBot 6eabea6a71 Corrects abductor uncuffing message (#33895) 
* Corrects abductor uncuffing message

* breaks
 2017-12-29 02:56:30 -06:00
YPOQandCitadelStationBot 8bf721d5b7 Fixes plant juicing (#33896) 2017-12-29 02:56:22 -06:00
Buggy123andCitadelStationBot 2c40a61968 Increases research point income by 33% (#33857) 2017-12-29 02:55:10 -06:00
MoreRobustThanYouandCitadelStationBot 07ba4e8189 The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873) 2017-12-29 02:55:03 -06:00
RobustinandCitadelStationBot d7723a064c Spell action buttons finally fixed (#33882) 
* Action button fix

* Action button fix

* Spell action button fix

* Spell action button fix

* Update alien_powers.dm

* Update spell.dm

* Action button fix

* Update touch_attacks.dm
 2017-12-29 02:54:50 -06:00
CosmicScientistandCitadelStationBot 0078782285 Adds colour shift to timestop (#33847) 
* For PKPenguin, from Cosmic

* Removes a colour removal line due to no functionality
 2017-12-29 02:53:37 -06:00
coiaxandCitadelStationBot 866318e33e Internal radio implant 2017-12-29 02:52:24 -06:00
XDTMandCitadelStationBot d8943d6a1e [Ready]Adds the Pax reagent, small tweaks to pacifism 2017-12-29 02:37:58 -06:00
LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 
# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm
 2017-12-29 01:34:17 -06:00
LetterJay 1047dccdd5 fk 2017-12-29 01:20:09 -06:00
deathride58andGitHub 96543b5e63 Merge pull request #4566 from Citadel-Station-13/upstream-merge-33881 
[MIRROR] Makes reset_perspective handle turf as eye
 2017-12-29 06:48:10 +00:00
deathride58andGitHub b03a8a70db Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442 
[MIRROR] [READY]Adds picking up corgis and pAIs!
 2017-12-29 06:47:17 +00:00
deathride58andGitHub bc6df43cd0 Merge pull request #4565 from Citadel-Station-13/upstream-merge-33879 
[MIRROR] Removes typepath from random event admin message
 2017-12-29 06:45:22 +00:00
LeoandCitadelStationBot ad59b058ad Merge pull request #33876 from AnturK/roundend_feedback_standard 
Cleans up survivor counting tiny bit
 2017-12-29 00:29:49 -06:00
Buggy123andCitadelStationBot 6ce76e38d4 CTF flags are no longer locked to CTF. (#33874) 
* CTF flags are no longer locked to CTF.

* Var added to enable/disable pickup by anybody.
 2017-12-29 00:29:42 -06:00
AnturKandCitadelStationBot fa7d2a4790 Makes default admin volume work again. (#33875) 2017-12-29 00:29:35 -06:00
Jordan BrownandCitadelStationBot 77f9295df2 Fixes ghost light not moving while orbiting (#33878) 2017-12-29 00:29:27 -06:00
RobustinandCitadelStationBot a9a94f7aed Dead cultists can now cross Reebe's "Servant Blocker" (#33558) 
* Dead Cultist Exception

* Servant blocker update

* Corpse balance

* Lets corpses pass servant blocker

* Lets cult corpses pass servant blocker

* Update servant_blocker.dm

* Update open.dm

* Update servant_blocker.dm

* Update open.dm
 2017-12-29 00:29:19 -06:00
AnturKandCitadelStationBot ccdccb57af Adds roundend nuke disk location tracking to feedback. 2017-12-29 00:29:12 -06:00
CruixandCitadelStationBot ab408d3e97 Made atoms not smooth with shuttles (#33807) 
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
 2017-12-29 00:29:04 -06:00
orangesandCitadelStationBot 4e1770a21f Fixes admin fingerprintslast 2017-12-29 00:28:55 -06:00
YPOQandCitadelStationBot 6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00