shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,503 Commits 5 Branches 0 Tags
b3c70bf024b193d7f1f29f3480eda38db303ca14
Commit Graph
1940 Commits
Author SHA1 Message Date
LetterJayandGitHub b3c70bf024 Merge pull request #2525 from Citadel-Station-13/upstream-merge-30204 
[MIRROR] Fixes APC pixel shift being off
 2017-08-28 09:00:46 -05:00
LetterJayandGitHub db56781717 Merge pull request #2522 from Citadel-Station-13/upstream-merge-30222 
[MIRROR] Fixes surplus log icons.
 2017-08-28 08:58:06 -05:00
LetterJayandGitHub 03a26e6468 Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5 
absolute pathing for mammals
 2017-08-28 08:56:55 -05:00
LetterJayandGitHub 29de038837 Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162 
[MIRROR] Gives plasmamen hallucinations when taking blackpowder
 2017-08-28 08:54:01 -05:00
LetterJayandGitHub c043b8a1d5 Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182 
[MIRROR] Holoparasite prompts now have a "Never For This Round" option
 2017-08-28 08:46:19 -05:00
LetterJayandGitHub 7474aa3edb Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191 
[MIRROR] Fixes empty adminhelp tickets messages
 2017-08-28 08:45:49 -05:00
LetterJayandGitHub 5225aa7d65 Merge pull request #2493 from Citadel-Station-13/upstream-merge-30192 
[MIRROR] Adds volume control to admin-played sounds
 2017-08-28 08:45:34 -05:00
CitadelStationBot 4a456fd2c7 Fixes APC pixel shift being off 2017-08-28 02:20:25 -05:00
CitadelStationBot 993b452729 Fixes surplus log icons. 2017-08-28 02:20:11 -05:00
kevinz000andGitHub 5ebf1c4b6b Update furrypeople.dm 2017-08-27 19:48:29 -07:00
CitadelStationBotandkevinz000 349bd03b73 Adds periods to larva roars (#2512) 2017-08-27 06:42:16 -07:00
CitadelStationBotandkevinz000 94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
ktccdandkevinz000 985ea0d768 Sets all food prefs to NONE (#2517) 
People can RP their food likes/dislikes. This stuff, like deciding what
is/isn't edible to slimes and such is unasked for and unecessary.
Also, they didn't address that this stealth-nerfs non-humans as
donk-pockets and such food items were put in a lot of places, expecting
to be used for healing, but can now not be eaten by, for example,
lizards.
 2017-08-27 05:54:48 -07:00
ktccdandkevinz000 cdfa4148b4 Makes genitals_use_skintone save (#2514) 
Adds a hook or whatever for it to save the setting.
Now, granted, with my previous PR this is probably pointless since
humans got custom colours now...
But it's good practice, you know? In case we revert the other PR and
all.
 2017-08-27 04:22:04 -07:00
kevinz000andGitHub 68f463452e Revert "Lets humans use MUTCOLORs [Maximum Heresy]" - turns out this is breaking things (#2516) 
fine ktccd il do it
 2017-08-27 04:21:29 -07:00
ktccdandkevinz000 e6114f7840 Makes humans use MUTCOLORS (#2513) 
Exactly what it sounds like. Enables humans to use mutant colours and
disables the preset skintones.
Preset skintones are still doable, since mutant colours can be
accurately adjusted by putting in RGB values for the colours, but it'd
be more manual work. On the other hand, you can now get a more accurate
skin tone...
 2017-08-27 00:58:50 -07:00
CitadelStationBotandkevinz000 66f046fe87 Fixes timestop spell (#2506) 2017-08-26 19:49:16 -07:00
kevinz000andGitHub 3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
CitadelStationBot b151209160 Gives plasmamen hallucinations when taking blackpowder 2017-08-26 11:07:33 -05:00
CitadelStationBot d38580afcd Holoparasite prompts now have a "Never For This Round" option 2017-08-26 11:07:20 -05:00
CitadelStationBot f21f2c8207 Adds volume control to admin-played sounds 2017-08-26 11:07:11 -05:00
CitadelStationBot 8be784e667 Fixes empty adminhelp tickets messages 2017-08-26 11:07:06 -05:00
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBotandkevinz000 3ea2288820 Fixes sounds for toy nuke, red button, and talking action figures (#2475) 2017-08-24 18:31:24 -07:00
CitadelStationBotandkevinz000 d5dfe45c1e Dummies no longer queue, which humans probably shouldn't do ever (#2477) 2017-08-24 18:30:51 -07:00
CitadelStationBotandkevinz000 7a4df41221 Remove some unused goonchat stuff (#2481) 2017-08-24 18:29:50 -07:00
CitadelStationBotandkevinz000 47596fadfc Makes boss tiles immune to the oldest boss, Lord Singuloth (#2465) 2017-08-24 18:27:29 -07:00
CitadelStationBotandkevinz000 a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -07:00
kevinz000andGitHub 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000andGitHub 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay 15b378ddf4 adminrank hotfix 2017-08-22 03:51:21 -05:00
LetterJayandGitHub 2954e8ad16 Merge pull request #2455 from Citadel-Station-13/kevinz000-patch-4 
Makes beepsky stop bullying 2hus
 2017-08-22 02:29:13 -05:00
LetterJay b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
kevinz000andGitHub d56cc32cf0 Update human.dm 2017-08-21 21:43:17 -07:00
kevinz000andGitHub 4316a5a61b Update human.dm 2017-08-21 21:41:59 -07:00
LetterJayandGitHub a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBotandkevinz000 b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
kevinz000andGitHub 61e6f2815b Update stomach.dm (#2453) 2017-08-21 20:27:21 -07:00
CitadelStationBotandkevinz000 e6650e6f35 Refined Test Areas (Station Z) debug output (#2321) 2017-08-21 20:25:20 -07:00
CitadelStationBotandkevinz000 b72d304f1c [MIRROR] Fixes the amounts for examining disgusted people (#2253) 
* Fixes the amounts for examining disgusted people

* Update examine.dm

* Delete examine.dm.rej
 2017-08-21 20:24:29 -07:00
CitadelStationBotandkevinz000 4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBotandkevinz000 999c921f63 Removes the chat message from *spin (#2428) 2017-08-21 19:54:24 -07:00
LetterJayandGitHub f2f1474123 Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747 
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
 2017-08-21 20:32:10 -05:00
Poojawaandkevinz000 91fc414b20 Changes Ghost role ping sound effects (#2441) 
* change that fucking blare

* Update xenobiology.dm
 2017-08-21 17:05:09 -07:00
ktccdandkevinz000 597c048975 This was bothering me (#2449) 
Now it's fixed.
 2017-08-21 17:03:41 -07:00
ktccdandkevinz000 987c0c35da Makes Taurs not render human legs (#2448) 
Since taurs use their own sprite legs instead, we'll rely on those.
This'll fix some fringe cases with nagas and the problem with driders
completely covering their front drider legs.
This will introduce some weirdness with cutting off limbs, since taur
sprites have NO support for this, but I would need to completely
refactor how we handle taurs to split up their sprites like that... And
I'm not THAT good.
 2017-08-21 17:03:29 -07:00
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
CitadelStationBot da6e3d7c8e readds toggle_hear_radio admin verb 2017-08-19 06:45:50 -05:00
CitadelStationBot f7bde6a76a Makes mixing meth dangerous again 2017-08-18 18:59:58 -05:00