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

3211 Commits

Author SHA1 Message Date
LetterJay
a17ed054d6 Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172 
[MIRROR] Maintains that weird entire-tcomms-setup-in-one-machine thing
 2017-08-28 08:56:11 -05:00
LetterJay
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
LetterJay
2fe2912fa3 Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173 
[MIRROR] Traitor, a traitor is a traitor.
 2017-08-28 08:46:53 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
1457e388c2 Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183 
[MIRROR] Small devil fixes.
 2017-08-28 08:45:16 -05:00
CitadelStationBot
349bd03b73 Adds periods to larva roars (#2512) 2017-08-27 06:42:16 -07:00
CitadelStationBot
94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00
ktccd
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
ktccd
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
kevinz000
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
CitadelStationBot
4c4bd22578 [MIRROR] Some more tweaks to Geis (#2487) 
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
 2017-08-27 01:36:17 -07:00
ktccd
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
CitadelStationBot
66f046fe87 Fixes timestop spell (#2506) 2017-08-26 19:49:16 -07:00
CitadelStationBot
14ceaa39b4 Fixes component dupe checks not actually checking if there IS a dupe component (#2501) 2017-08-26 19:11:03 -07:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
CitadelStationBot
18904f2f0f Maintains that weird entire-tcomms-setup-in-one-machine thing 2017-08-26 11:08:01 -05:00
CitadelStationBot
b151209160 Gives plasmamen hallucinations when taking blackpowder 2017-08-26 11:07:33 -05:00
CitadelStationBot
3a6a277f08 Traitor, a traitor is a traitor. 2017-08-26 11:07:24 -05:00
CitadelStationBot
d38580afcd Holoparasite prompts now have a "Never For This Round" option 2017-08-26 11:07:20 -05:00
CitadelStationBot
e9180afe0a Small devil fixes. 2017-08-26 11:07:16 -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
kevinz000
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
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
ktccd
45285ef491 Fixes a lot of problems in dogborg code (#2471) 
List of things I fixed:
old << style messages didn't do crap, replaced with to_chat
Medidog now respects your vore preferences also.
K9 referenced the wrong type of sleeper unit by name, fixed now.
All do_after checks now also have a check for distance once the timer is
up.
All do_after checks now properly sets target = <thing to target>. This
is probably making the previous thing on the list redundant, but an
extra sanity check isn't a bad idea... I think?
 2017-08-24 18:36:13 -07:00
CitadelStationBot
3ef56206c1 Fixes component cleanup (#2485) 2017-08-24 18:31:54 -07:00
CitadelStationBot
fce68d3b76 Removes text restriction on add/set_details (#2474) 2017-08-24 18:31:41 -07:00
CitadelStationBot
3ea2288820 Fixes sounds for toy nuke, red button, and talking action figures (#2475) 2017-08-24 18:31:24 -07:00
CitadelStationBot
d5dfe45c1e Dummies no longer queue, which humans probably shouldn't do ever (#2477) 2017-08-24 18:30:51 -07:00
CitadelStationBot
43cad07181 Transit tube pods no longer constantly suck in air (#2478) 2017-08-24 18:30:12 -07:00
CitadelStationBot
7a4df41221 Remove some unused goonchat stuff (#2481) 2017-08-24 18:29:50 -07:00
CitadelStationBot
e8b1e104ee [MIRROR] ssgarbage now runs every 2 seconds. (#2461) 
Lets hope this fixes some lag - [MIRROR] ssgarbage now runs every 2 seconds.
 2017-08-24 18:29:37 -07:00
CitadelStationBot
483d31dee8 reduces communications cooldown (#2483) 2017-08-24 18:27:47 -07:00
CitadelStationBot
47596fadfc Makes boss tiles immune to the oldest boss, Lord Singuloth (#2465) 2017-08-24 18:27:29 -07:00
CitadelStationBot
a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -07:00
kevinz000
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
kevinz000
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
LetterJay
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
kevinz000
d56cc32cf0 Update human.dm 2017-08-21 21:43:17 -07:00
kevinz000
4316a5a61b Update human.dm 2017-08-21 21:41:59 -07:00
LetterJay
2241f5ecfb Update cult_items.dm 2017-08-21 23:32:21 -05:00
LetterJay
cef534face Update mutations.dm 2017-08-21 23:31:55 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
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
kevinz000
61e6f2815b Update stomach.dm (#2453) 2017-08-21 20:27:21 -07:00
CitadelStationBot
e6650e6f35 Refined Test Areas (Station Z) debug output (#2321) 2017-08-21 20:25:20 -07:00