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

834 Commits

Author SHA1 Message Date
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
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
Poojawa
aec48daa0a Ashdrake noms (#2868) 
* Initial commit

* probably a better way to check this

* It compiled boys. Let's see if it works.

* IT WAS ALL NULLS, BOYS

* Hooray, it's not broken anymore boys!

* Well it works, but we need transfer IDs to work

locating them post-initialize would help, probably. Then assigning their
links soon after.

* Bellies linked, autotransfer, LoseTarget

* half-thought sanity check needs to go away

* A few last minute tweaks.
 2017-09-21 06:29:08 -05:00
oranges
9ee60af5e8 Merge pull request #30768 from Cyberboss/BringingSexyBack 
Adds back required arrivals undockedness with a config
 2017-09-20 03:55:14 -05:00
Poojawa
5b6be1bc44 wew, memes. (#2869) 2017-09-20 01:39:46 -05:00
Poojawa
4ab7f126ed Vore system updates (#2864) 
* Tasting, digest/transfer chance, improvements

* more vague for defaults

* Actually let's hold off on silenced mode 'cuz broke

* make sure it's all commented out

* reverts vorepanel updater, buggy af. Adds mob vore

Ian can eat you now. \o/
 2017-09-19 14:03:13 -05:00
CitadelStationBot
fd2e1c896f [MIRROR] Fixes incorp move runtimes on border movement. (#2774) 
* Fixes incorp move runtimes on border movement.

* Update mob_movement.dm

* Update mob_movement.dm
 2017-09-19 07:00:54 -05:00
CitadelStationBot
3afe490be3 [MIRROR] Fixes bees attacking apiaries (#2772) 
* Fixes bees attacking apiaries

* Update bees.dm
 2017-09-19 06:37:30 -05:00
CitadelStationBot
d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
CitadelStationBot
680e9e9697 [MIRROR] Quick pAI software buying tweak (#2825) 
* Added the thing that Cruix wanted

* Quick pAI software buying tweak

* Update software.dm
 2017-09-17 22:59:33 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBot
99e0463261 [MIRROR] Fixes bluespace golem teleport icon (#2834) 
* Fixes bluespace golem teleport icon

* Fixes bluespace golem teleport icon
 2017-09-17 22:31:55 -05:00
CitadelStationBot
656b9c2810 [MIRROR] Fixes remaining dummy delete runtime. (#2824) 
* Fixes remaining dummy delete runtime.

* Fixes remaining dummy delete runtime.
 2017-09-17 22:23:43 -05:00
CitadelStationBot
55294bfb2a [MIRROR] Fixes blackbox artifact exploits (#2845) 
* Fixes blackbox artifact exploits

* Update colossus.dm

* Update colossus.dm
 2017-09-17 22:15:45 -05:00
deathride58
252d8619da nerfs runtime's nudity 2017-09-17 21:09:29 -04:00
CitadelStationBot
3c8f4ca032 [MIRROR] Monkeys are now more likely to become Gorillas (#2806) 
* Monkeys are now more likely to become Gorillas (#30775)

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

* Delete AutoChangeLog-pr-30056.yml

* Monkey to Gorilla now more likely

* Monkeys are now more likely to become Gorillas
 2017-09-17 12:02:23 -05:00
CitadelStationBot
08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796) 
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
 2017-09-17 11:59:40 -05:00
Poojawa
dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818) 
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
 2017-09-17 11:56:55 -05:00
CitadelStationBot
956efbef27 [MIRROR] Removes corgis as a facehugger target (#2791) 
* Removes corgis as a facehugger target (#30719)

* Removes corgis as a facehugger target
 2017-09-16 04:33:16 -05:00
Poojawa
0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759) 
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
 2017-09-16 04:29:22 -05:00
CitadelStationBot
ca2665a128 [MIRROR] gives the krebs a new sprite (#2761) 
* gives the krebs a new sprite

* Update crab.dm
 2017-09-15 03:35:56 -05:00
CitadelStationBot
c4e6642530 [MIRROR] Stops dead monkeys from moving (#2780) 
* Merge pull request #30709 from vuonojenmustaturska/hisgrace

Stops dead monkeys from moving

* Stops dead monkeys from moving
 2017-09-15 03:23:40 -05:00
CitadelStationBot
b5dc828756 [MIRROR] Procedurally generated Gondolas. (#2786) 
* Procedurally generated Gondolas. (#30700)

* Adds Gondoland and the rare Gondolas

* at the end of history

* /lizard >>> /gondola

* expand GOND

* for cyberboss he wants it in TGM

* thicc health

* thiccer health

* Procedurally generated Gondolas

* Procedurally generated Gondolas

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Procedurally generated Gondolas.
 2017-09-15 03:22:19 -05:00
CitadelStationBot
35fc9d0391 [MIRROR] Fixes pAI integrated light (#2764) 
* Fixes pAI integrated light (#30690)

* Fixes pAI integrated light
 2017-09-14 13:22:27 -05:00
CitadelStationBot
1051fb4fa7 [MIRROR] Corrects runtime in observer.dm (#2610) 
* Corrects runtime in observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm

* Update observer.dm
 2017-09-13 22:55:22 -05:00
CitadelStationBot
099b6628fa [MIRROR] Full jobs will no longer be shown as priority for latejoiners (#2729) 
* Full jobs will no longer be shown as priority for latejoiners

* Update card.dm
 2017-09-13 22:54:41 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
CitadelStationBot
9031a1b671 [MIRROR] Soft crit slowdown for all carbons (#2743) 
* Soft crit slowdown for all carbons

* Update carbon_movement.dm

* Update carbon_movement.dm

* Update species.dm

* actually pay attention to spacings
 2017-09-13 21:29:50 -05:00
CitadelStationBot
067e03726f [MIRROR] Renames the mob spawner menu (#2620) 
* Renames the mob spawner menu

* Actually mirrors
 2017-09-13 20:42:40 -05:00
CitadelStationBot
26320a7047 [MIRROR] Fixes stands not dying with their user (#2615) 
* Fixes stands not dying with their user

* actually mirrors
 2017-09-13 20:26:52 -05:00
CitadelStationBot
e1d2d3d36d [MIRROR] Adds "large bun" hairstyle (#2609) 
* Adds "large bun" hairstyle

* bun hair hair'd
 2017-09-13 18:34:40 -05:00
CitadelStationBot
1c06a2b277 [MIRROR] Fixes goliath tentacles (#2738) 
* Merge pull request #30646 from ChangelingRain/tentafix

Fixes goliath tentacles

* Fixes goliath tentacles
 2017-09-13 16:53:52 -05:00
LetterJay
1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJay
4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583 
[MIRROR] Fixes initialize hints for a fair number of mobs and items
 2017-09-12 23:31:28 -05:00
LetterJay
c924ec765a Update ed209bot.dm 2017-09-12 23:19:05 -05:00
LetterJay
e88bb9c612 Update shadowpeople.dm 2017-09-12 23:15:53 -05:00
LetterJay
912746d8a4 Merge pull request #2700 from Citadel-Station-13/upstream-merge-30584 
[MIRROR] Fixes ventriloquist dummy
 2017-09-12 19:11:09 -05:00
LetterJay
81fdf521fb Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502 
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
 2017-09-12 19:10:21 -05:00
LetterJay
6b27a81e61 Update powers.dm 2017-09-12 03:10:07 -05:00
LetterJay
fcfd4a2ce1 Update ed209bot.dm 2017-09-12 03:06:43 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
a5a8f8faba Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530 
[MIRROR] Adds Gondoland and the rare Gondolas
 2017-09-12 01:21:09 -05:00