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

882 Commits

Author SHA1 Message Date
LetterJay
7263926251 Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038 
[MIRROR] DisplayTimeText for setup time on login
 2017-09-29 12:18:25 -04:00
LetterJay
d535514909 Merge pull request #2994 from Citadel-Station-13/upstream-merge-31061 
[MIRROR] Fixes MMI buckled-warning
 2017-09-29 01:45:08 -04:00
LetterJay
75359598b3 Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060 
[MIRROR] Fixes larva evolving while restrained
 2017-09-29 01:43:07 -04:00
ShizCalev
9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) 
* Stops revheads metagaming

* Added comment.
 2017-09-28 22:00:16 -05:00
kingofkosmos
977163ae54 Fixes MMI buckled-warning (#31061) 
* Fixes MMI having a buckled-warning when trying to move.

* Comment added.
 2017-09-28 21:48:35 -05:00
YPOQ
a780d6f79e Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:43 -05:00
LetterJay
3e27458d11 Merge pull request #2968 from Augustfox/master 
Organize hair and facial hair in character creation
 2017-09-28 12:29:10 -04:00
LetterJay
4e19b5a5f8 Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041 
[MIRROR] Removes some spawns
 2017-09-28 12:25:33 -04:00
LetterJay
e6356d2560 Merge pull request #2955 from Citadel-Station-13/upstream-merge-31020 
[MIRROR] Variants will not be spawned by gold cores
 2017-09-28 12:22:44 -04:00
Jordan Brown
97b8a6ed3b Removes some spawns 2017-09-28 10:43:07 -05:00
CitadelStationBot
2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967) 
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
 2017-09-28 05:59:57 -07:00
Augustfox
612707c999 Alphabetize hair and facial hair in char creation 
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
 2017-09-27 23:45:15 -05:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888 
[MIRROR] Refactors cinematics.
 2017-09-27 23:42:35 -04:00
LetterJay
d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
ShizCalev
fa92394e4e DisplayTimeText for round time on login 2017-09-27 15:45:05 -05:00
LetterJay
18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893 
[MIRROR] Datum abductors refactor
 2017-09-27 16:31:53 -04:00
Armhulen
0aea66649e whoops we'll get right on that (#31020) 2017-09-27 00:45:49 -05:00
vuonojenmustaturska
10bf80139c Fixes MMI to AI law transfer (#31017) 
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
 2017-09-26 16:52:17 -05:00
ShizCalev
4bab4181f2 Fixes alium leap exploit 2017-09-26 13:54:26 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
LetterJay
8ff51624e1 Merge pull request #2934 from Citadel-Station-13/upstream-merge-30913 
[MIRROR] Stops AIs from giving the borg a free secondary light
 2017-09-25 13:29:02 -04:00
ShizCalev
169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
pubby
34e186dadb Datum abductors refactor 2017-09-24 18:00:49 -05:00
KorPhaeron
31f6898a87 Stops AIs from giving the borg a free secondary light (#30913) 
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
 2017-09-24 17:58:37 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
Armhulen
2f64e2099f Rare Spider Variants! (#30593) 
* vipers use venom, tarantulas are fat and slow.

* viper!

added!

* tarantula!

done!

* tarantulas are big guys

nobody pushin them round

* added maidwives, added spider channel

* me and cobby lose our minds over shitcode 2

electric boogaloo

* midwives have skins

shiny

* YES XHUIS GOT IT WORKING WHAT A GUY YEAAAAAAAAAAA

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO

* new nurse sprite is in!

yay

* cosby joke about all my shit corrupting idk

this is gonna be annoying to fix

* Revert "cosby joke about all my shit corrupting idk"

This reverts commit 680b4c310e0b882f7465129c093e7f69fdff15c6.

* starts to add spidervenom, finishing tomorrow

* fuck god dammit shit fuck

* WE ARE BACK IN BIZNIZ TY ORANGES

* whoops

* feed me semour feed me all night long

fixes the cyberboss stuff except that complicated one i'll do something else with it for now

* temporary fix maybe

* lets just have this for now and i'll fix this later

* all good

* fixes

* does what i should have done a long time ago

* SKINS SKINS SKINS PULLAPALOOZA

* i think this does it okay

* spiders miright

* merge conflict fix?

* MISTAKES WERE MADE

* spider commands are cool now

* he protec

but he also attac

* ty joan

* ty joan again
 2017-09-23 16:18:43 -05:00
LetterJay
cddcd82840 Update login.dm 2017-09-23 13:52:29 -05:00
Robustin
894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
CitadelStationBot
c1ea0af35e [MIRROR] Support Holoparasites can no longer heal while not manifested (#2915) 
* Merge pull request #30948 from MoreRobustThanYou/patch-13

Support Holoparasites can no longer heal while not manifested

* Support Holoparasites can no longer heal while not manifested
 2017-09-23 06:16:55 -05:00
CitadelStationBot
9016cc6a17 [MIRROR] pAIs now transfer their languages to bots (#2913) 
* Merge pull request #30943 from MoreRobustThanYou/patch-11

pAIs now transfer their languages to bots

* pAIs now transfer their languages to bots
 2017-09-23 05:54:16 -05:00
CitadelStationBot
51d8182b13 [MIRROR] Fixes species being referenced instead of copied when cloning (#2859) 
* Fixes species being referenced instead of copied when cloning

* fixes

* wew
 2017-09-23 00:34:09 -05:00
CitadelStationBot
0587962b53 [MIRROR] Makes gorillas drop brains when gibbed / butchered (#2878) 
* Makes gorillas drop brains when gibbed / butchered

* wew

* how the fuck did this even go missing

* this fucking game man.
 2017-09-23 00:13:04 -05:00
CitadelStationBot
a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBot
2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -05:00
Poojawa
6717720356 copypasta fails again 2017-09-22 23:34:41 -05:00
CitadelStationBot
3aafe338af [MIRROR] Fixes adjust config (#2723) 
* Fixes adjust config

* Update configuration.dm

* Update game_options.txt

* fixes persistance
 2017-09-22 23:02:09 -05:00
CitadelStationBot
e0b3e861c0 [MIRROR] Removes spawn()s in securitrons (#2901) 
* Removes spawn()s in securitrons (#30945)

* Removes spawns in securitrons

* Update sound.dm

* Update secbot.dm

* Removes spawn()s in securitrons
 2017-09-22 22:37:07 -05:00
CitadelStationBot
e9e80e3ce6 [MIRROR] Stops restraint removal progress bar spam (#2899) 
* Stops restraint removal progress bar spam

* Stops restraint removal progress bar spam
 2017-09-22 22:36:16 -05:00
CitadelStationBot
7b7ddccbbc [MIRROR] Zombies cease healing for 6 seconds after taking damage (#2897) 
* Zombies cease healing for 6 seconds after taking damage (#30885)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Organic var for Organs

* Update liver.dm

* Zombie healing ceases in combat

* Update zombies.dm

* Update liver.dm

* Update organ_internal.dm

* TIMER_OVERRIDE

* 2 equal signs

* New condition structure

* UNIQUE and OVERRIDE

* Removes timer

* Zombies cease healing for 6 seconds after taking damage
 2017-09-22 22:32:22 -05:00
CitadelStationBot
2c78f7122c [MIRROR] Adds some new plushies (#2866) 
* Adds some new plushies

* Update packs.dm
 2017-09-22 22:31:07 -05:00
CitadelStationBot
6efb76fad5 [MIRROR] Ammo cleanup (#2643) 
* Ammo cleanup

* Update briefcase.dm

* Update manned_turret.dm

* Update mime.dm

* Update manned_turret.dm

* Update manned_turret.dm

* fixes

* mime memes
 2017-09-22 22:30:44 -05:00
CitadelStationBot
3e2f638793 [MIRROR] Cleans up internal temp code (#2853) 
* Cleans up internal temp code (#30715)

* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm

* Cleans up internal temp code

* Update living.dm

* Update living.dm

* fixes then ommits mob_temp stuff.

* wew lad. commenting shit out is picky af.
 2017-09-22 20:20:56 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847) 
* New squeaky datum and plushes

* Update bananashoes.dm
 2017-09-22 19:43:56 -05:00
CitadelStationBot
944753dccd [MIRROR] Makes action buttons call the correct procs (#2902) 
* Makes action buttons call the correct procs (#30921)

* Makes action buttons call the correct procs

* Changed to mob/living proc

* CB

* Makes action buttons call the correct procs
 2017-09-22 19:00:34 -05:00
LetterJay
54bd982d6b Merge pull request #2787 from Citadel-Station-13/upstream-merge-30681 
[MIRROR] Prevents the creation of Shadowzombiechangelings
 2017-09-22 08:43:37 -04:00
CitadelStationBot
9e18d9055a [MIRROR] Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc. (#2886) 
* Merge pull request #30890 from vuonojenmustaturska/adminghostfix

Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.

* Removes the ability of non-interacting admin ghosts to steal and carry objects, pick pockets etc.
 2017-09-22 04:47:39 -05:00
LetterJay
8c6c57ff32 Merge pull request #2885 from Citadel-Station-13/upstream-merge-30896 
[MIRROR] Removes old debug text
 2017-09-22 00:03:30 -04:00
Poojawa
b7739d1c77 Update hostile.dm 2017-09-21 15:40:04 -05:00
LetterJay
dd7189618f Merge pull request #2873 from Citadel-Station-13/upstream-merge-30768 
[MIRROR] Adds back required arrivals undockedness with a config
 2017-09-21 07:37:04 -04:00
LetterJay
c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00