shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,767 Commits 5 Branches 0 Tags
764df7609b8566fe545acf6e54068e7fb851b6db
Commit Graph
3423 Commits
Author SHA1 Message Date
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
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
ktccdandkevinz000 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
CitadelStationBotandkevinz000 3ef56206c1 Fixes component cleanup (#2485) 2017-08-24 18:31:54 -07:00
CitadelStationBotandkevinz000 fce68d3b76 Removes text restriction on add/set_details (#2474) 2017-08-24 18:31:41 -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 43cad07181 Transit tube pods no longer constantly suck in air (#2478) 2017-08-24 18:30:12 -07:00
CitadelStationBotandkevinz000 7a4df41221 Remove some unused goonchat stuff (#2481) 2017-08-24 18:29:50 -07:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 483d31dee8 reduces communications cooldown (#2483) 2017-08-24 18:27:47 -07:00
CitadelStationBotandkevinz000 47596fadfc Makes boss tiles immune to the oldest boss, Lord Singuloth (#2465) 2017-08-24 18:27:29 -07:00
CitadelStationBot 342fd1d7fa Alternative To Removing Kudzu Manufacturing (#30080) 2017-08-23 15:46:54 -05: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 2241f5ecfb Update cult_items.dm 2017-08-21 23:32:21 -05:00
LetterJayandGitHub cef534face Update mutations.dm 2017-08-21 23:31:55 -05: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
kevinz000andGitHub 7a5497bb40 FUCK (#2452) 
FUCK - Fixes Vending Machines
 2017-08-21 20:12:22 -07:00
CitadelStationBotandkevinz000 999c921f63 Removes the chat message from *spin (#2428) 2017-08-21 19:54:24 -07:00
LetterJayandGitHub dfd5c7465b Merge pull request #2246 from Citadel-Station-13/upstream-merge-29647 
[MIRROR] Fixes SendSignal()
 2017-08-21 21:50:39 -05:00
kevinz000 365b16e298 saving work 2017-08-21 19:47:23 -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
LetterJayandGitHub 83f4733027 Rename _circuitboard.dm to circuitboard.dm 2017-08-21 20:01:59 -05:00
LetterJayandGitHub 9b049e6f49 Rename machinery.dm to _machinery.dm 2017-08-21 19:42:43 -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 259edee5a2 Update component.dm 2017-08-21 18:49:14 -05:00
LetterJayandGitHub 17c0c4ba79 FUCK 2017-08-21 18:39:30 -05:00
LetterJayandGitHub 39a69c2a28 Update component.dm 2017-08-21 16:50:29 -05:00
LetterJayandGitHub ab26b486b7 Update component.dm 2017-08-21 02:38:51 -05:00
CitadelStationBot 41b0f9f9d4 Gorillas 2017-08-20 19:56:21 -05:00
CitadelStationBot 772299445e Makes the Ark of the Clockwork Justicar much more fancy 2017-08-20 19:55:15 -05:00
LetterJayandGitHub 2181449c7d Merge pull request #2435 from Citadel-Station-13/upstream-merge-29984 
[MIRROR] Gives SSdisease SS_NO_INIT
 2017-08-20 09:57:09 -05:00