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

2382 Commits

Author SHA1 Message Date
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
LetterJay
8fd6d9d883 Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980 
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
 2017-09-25 13:28:05 -04:00
LetterJay
196caaf3e1 Merge pull request #2931 from Citadel-Station-13/upstream-merge-30984 
[MIRROR] Makes keywords_lookup use the global token
 2017-09-25 13:27:46 -04:00
LetterJay
45751464e0 Merge pull request #2930 from Citadel-Station-13/upstream-merge-30975 
[MIRROR] Href tokens
 2017-09-25 13:27:27 -04:00
LetterJay
954b056e97 Update security.dm 2017-09-25 11:56:55 -05:00
Poojawa
2071dfd1a5 Readds alert level sounds (#2920) 2017-09-24 21:21:33 -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
oranges
a6ae23aefb Merge pull request #30984 from tgstation/Cyberboss-patch-4 
Makes keywords_lookup use the global token
 2017-09-24 17:35:49 -05:00
oranges
6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
LetterJay
beedb36400 Merge pull request #2909 from Poojawa/flightsuit-adjustments 
Flight suit tweaks
 2017-09-24 15:47:50 -04:00
LetterJay
076ba227e5 Merge pull request #2583 from deathride58/screenshake 
Extra Screenshake and Screenshake accessories.
 2017-09-24 11:34:50 -04:00
LetterJay
914e661618 Merge pull request #2908 from Citadel-Station-13/Ashwalker-nerfs 
Mining Shuttle requires mining access to use
 2017-09-24 11:33:21 -04:00
LetterJay
51b44c1726 Merge pull request #2921 from Citadel-Station-13/upstream-merge-30593 
[MIRROR] Rare Spider Variants!
 2017-09-24 09:34:52 -04:00
ktccd
c8aeec815a Adds sanitation to flavor_text (#2926) 
Exactly what it sounds like. Boy, my security skills are shit, for
someone who's supposed to be studying exactly this shit at uni, isn't
it?
 2017-09-24 03:15:02 -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
95e614f4b7 Merge pull request #2917 from Citadel-Station-13/upstream-merge-30956 
[MIRROR] Fixes revolutionary deconversion messages and logging
 2017-09-23 16:45:53 -04:00
LetterJay
cddcd82840 Update login.dm 2017-09-23 13:52:29 -05:00
LetterJay
44f779cc1f Merge pull request #2912 from Citadel-Station-13/upstream-merge-30931 
[MIRROR] Fixes create outfit Href issues
 2017-09-23 14:51:31 -04:00
deathride58
4e793a5630 Should work 2017-09-23 13:17:21 -04:00
Robustin
894673ef97 Fixes revolutionary deconversion messages and logging 2017-09-23 11:07:05 -05:00
deathride58
20700dab57 change for the sake of change - laying the groundwork to let players directly change the percentage of screenshake 2017-09-23 11:18:48 -04:00
deathride58
1ff6058b6a Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into screenshake 2017-09-23 11:07:32 -04:00
Poojawa
f004c09346 seriously, 1,261 lines changed over 2? 2017-09-23 06:18:54 -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
139130d70d [MIRROR] Zombies now stay dead if they suicide (#2914) 
* Zombies now stay dead if they suicide (#30941)

* Zombies now stay dead if they suicide

* Update items.dm

* Update items.dm

* Zombies now stay dead if they suicide
 2017-09-23 05:54:36 -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
Jordie
1030130672 Fixes create outfit Href issues 2017-09-23 05:32:36 -05:00
Poojawa
78f24fae3b some initial nerfing work 2017-09-23 04:02:03 -05:00
Poojawa
7b5734d684 faction memes don't work, restrict access instead. 2017-09-23 02:11:55 -05:00
Poojawa
ba9b5a0481 probably stops Ashligger station attacks 2017-09-23 00:58:32 -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
518e04a653 [MIRROR] Fixes game panel href token (#2898) 
* Fixes game panel href token

* wew
 2017-09-23 00:30: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
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895) 
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
 2017-09-22 23:35:36 -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
cc49f70de8 [MIRROR] Make scrubber code use temporary vars consistently (#2862) 
* Make scrubber code use temporary vars consistently

* fixes merge mess
 2017-09-22 20:11:50 -05:00
CitadelStationBot
bf1e4a456f [MIRROR] Improve atmos components code + OmegaStation fixes (#2752) 
* Improve atmos components code + OmegaStation fixes

* Update circulator.dm

* Update dp_vent_pump.dm

* Update pump.dm

* Update volume_pump.dm

* Update pump.dm

* Update pump.dm

* Update volume_pump.dm

* fixes pumps shows area rather than vague jump

also removes it from admin log, wew

* wew
 2017-09-22 20:05:58 -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