shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,437 Commits 5 Branches 0 Tags
358fa8e95f954a6d51e3b24191ec622c57a424d7
Commit Graph
4437 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 358fa8e95f Automatic changelog generation for PR #2325 [ci skip] 2017-08-22 20:20:48 -05:00
CitadelStationBotandkevinz000 a6d64204ad [MIRROR] Updates PubbyStation (#2325) 
no
 2017-08-22 18:20:46 -07:00
CitadelStationBotandkevinz000 d151ebf247 [Omega] Corrected space turf under syndie shuttle corners (#2418) 2017-08-22 18:13:23 -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
LetterJayandGitHub 74508dd34f Merge pull request #2411 from Citadel-Station-13/upstream-merge-29940 
[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var
 2017-08-22 02:28:43 -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
CitadelStationBot 53fb24ee7c Automatic changelog generation for PR #2253 [ci skip] 2017-08-21 22:24:30 -05: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
CitadelStationBot 7da5e2862d Automatic changelog generation for PR #2232 [ci skip] 2017-08-21 22:23:32 -05: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
CitadelStationBot 722b9005ac Automatic changelog generation for PR #2428 [ci skip] 2017-08-21 21:54:26 -05: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
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
LetterJay a6eb648f96 i hate the webeditor 2017-08-21 20:07:59 -05:00
LetterJayandGitHub 83f4733027 Rename _circuitboard.dm to circuitboard.dm 2017-08-21 20:01:59 -05:00
LetterJayandGitHub c41f948b6f Update tgstation.dme 2017-08-21 19:55:22 -05:00
LetterJayandGitHub 362eb50d27 Update tgstation.dme 2017-08-21 19:46:13 -05:00
LetterJayandGitHub 9b049e6f49 Rename machinery.dm to _machinery.dm 2017-08-21 19:42:43 -05:00
LetterJayandGitHub 41c310be8f Update tgstation.dme 2017-08-21 19:36: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
CitadelStationBot a09c49a0be Automatic changelog generation for PR #2448 [ci skip] 2017-08-21 19:03:31 -05: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
LetterJayandGitHub 7adf3b03a6 Merge pull request #2446 from Citadel-Station-13/upstream-merge-30024 
[MIRROR] Makes the Ark of the Clockwork Justicar much more fancy
 2017-08-21 02:07:57 -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
LetterJayandGitHub ae9e4495f9 Merge branch 'master' into upstream-merge-29747 2017-08-20 09:53:17 -05:00
LetterJayandGitHub 940f5da5fd Rename _machinery.dm to machinery.dm 2017-08-20 09:52:28 -05:00
LetterJayandGitHub 08bbe72923 Update portable_turret.dm 2017-08-20 09:50:56 -05:00
LetterJayandGitHub 0b57bbe184 Update iv_drip.dm 2017-08-20 09:50:22 -05:00
CitadelStationBot 5ddf45ca5d Automatic changelog generation for PR #2438 [ci skip] 2017-08-20 09:47:50 -05:00
LetterJayandGitHub 994d064eba Merge pull request #2438 from Citadel-Station-13/upstream-merge-30011 
[MIRROR] Diseases will properly make new symptoms instead of sharing the same for everyone
 2017-08-20 09:47:49 -05:00
CitadelStationBot 1e34378dbd Automatic changelog generation for PR #2439 [ci skip] 2017-08-20 09:47:34 -05:00