shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,898 Commits 5 Branches 0 Tags
5b61c84df40733a1de10c693d5467226e3aa72ed
Commit Graph
2084 Commits
Author SHA1 Message Date
kevinz000andGitHub 3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
CitadelStationBot cd11c01c42 Adds magillitis, a traitor serum for geneticists & CMOs 2017-08-26 11:07:42 -05: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
CitadelStationBot 0ca8580715 Corrects column name 2017-08-24 15:45:07 -05: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 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
CitadelStationBot 41b0f9f9d4 Gorillas 2017-08-20 19:56:21 -05:00
CitadelStationBot 3862fb5d5e Add logging of deathgasp last words and suicide stats to the death table 2017-08-20 19:41:58 -05:00
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
CitadelStationBot 196c9d0597 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. 2017-08-20 06:01:24 -05:00
CitadelStationBot 5eea016593 You can now click on symptoms in the Pandemic to see their description and stats 2017-08-19 18:52:55 -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
CactusandGitHub ad8af9f9ec fixes shark tail color 
husky ears moved to extra instead of inner, in line with wolf ears
 2017-08-18 17:27:07 -04:00
CactusandGitHub 61d7ad4e82 Stylesheet and Wolves (#2389) 
* organizes the mam_bodyparts file by species

* Revert "organizes the mam_bodyparts file by species"

This reverts commit ab692973ba20c282becf0d69514b1ac03d5447f8.

* stylesheet fix

* wolf sprite edits

* conflict resolution

* wolf accessories readded
 2017-08-18 15:35:08 -04:00
LetterJayandGitHub 6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 
[MIRROR] Merges the two turf/Entereds
 2017-08-18 13:41:23 -05:00
LetterJayandGitHub f378f66705 Merge pull request #2347 from Citadel-Station-13/upstream-merge-29794 
[MIRROR] Removes chat pings from href logs
 2017-08-18 11:27:13 -05:00
LetterJayandGitHub 094c4847f7 Merge pull request #2355 from Citadel-Station-13/upstream-merge-29849 
[MIRROR] More baseturf helpers
 2017-08-18 11:26:53 -05:00
LetterJayandGitHub 79c44b053d Merge branch 'master' into upstream-merge-29794 2017-08-18 11:14:45 -05:00
CitadelStationBot 39ea9fdcee Fix spelling of "cannabis" 2017-08-17 20:19:55 -05:00
CitadelStationBot 87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot 2a2e4b2af4 Improves attack logging of pulling / grabbing / throwing 2017-08-17 09:19:05 -05:00
CitadelStationBot e826e16739 Removes redundant check 2017-08-17 08:31:55 -05:00