shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,655 Commits 5 Branches 0 Tags
2ea1fff7f388d18a3beecc455eb46ee8e4e2e5a1
Commit Graph

3655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
2ea1fff7f3 Automatic changelog generation for PR #2031 [ci skip] 2017-07-15 23:19:43 -05:00
LetterJay
c3857fe264 Merge pull request #2031 from Citadel-Station-13/upstream-merge-29269 
[MIRROR] Fixes missiles being able to ricochet
 2017-07-15 23:19:41 -05:00
LetterJay
638213b2c2 Merge pull request #2030 from Citadel-Station-13/upstream-merge-29270 
[MIRROR] Cleaned up duped vars
 2017-07-15 23:19:26 -05:00
LetterJay
44473643bb Merge pull request #2029 from Citadel-Station-13/upstream-merge-29267 
[MIRROR] Makes round end delay message optional
 2017-07-15 23:19:08 -05:00
CitadelStationBot
e6fbba5404 Automatic changelog generation for PR #2005 [ci skip] 2017-07-15 23:18:54 -05:00
LetterJay
8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 
[MIRROR] Organ Update [Cloning isn't broken edition]
 2017-07-15 23:18:53 -05:00
CitadelStationBot
a4d968ec82 Fixes missiles being able to ricochet 2017-07-15 22:31:05 -05:00
CitadelStationBot
d286ed197e Cleaned up duped vars 2017-07-15 22:28:58 -05:00
CitadelStationBot
2cbfec38a2 Makes round end delay message optional 2017-07-15 22:19:46 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
cebutris
099b908d64 Fixes traitor holoparasites (#1904) 
* fixes holoparasites

* adds #1051 and #1066

* as it turns out I'm blind

* fixes line 500 indentation
 2017-07-15 11:48:56 -07:00
CitadelStationBot
b025182955 Possibly fix player_list sometimes having a null (#2022) 2017-07-15 11:45:33 -07:00
CitadelStationBot
82d3864625 Automatic changelog generation for PR #2019 [ci skip] 2017-07-15 13:45:12 -05:00
CitadelStationBot
b2f20fffd8 Fixes timestop! (and tweaks its sounds) (#2019) 2017-07-15 11:45:11 -07:00
CitadelStationBot
62180f8953 ClickCross now uses CanPass instead of density directly. (#2016) 2017-07-15 11:44:36 -07:00
CitadelStationBot
a7d63c437b Automatic changelog generation for PR #2015 [ci skip] 2017-07-15 13:44:27 -05:00
LetterJay
dcf957f0b2 adds icons for PDAs by Cecily and the hunter hat (#2015) 
* adds icons for PDAs by Cecily and the hunter hat

* Update cit_hats.dm
 2017-07-15 11:44:26 -07:00
CitadelStationBot
54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -07:00
CitadelStationBot
738eaa1d54 Fix the attackby of the supermatter containment core (#2024) 2017-07-15 11:42:39 -07:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot
9d0cd37dd3 Automatic changelog generation for PR #2021 [ci skip] 2017-07-15 13:40:51 -05:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
2ae38397c9 removes current method of handling flightsuit pulling (#2023) 2017-07-15 11:40:34 -07:00
LetterJay
3ed842376e Update species.dm 2017-07-15 10:06:30 -05:00
LetterJay
905db6ded5 Update DNA.dm 2017-07-15 10:05:00 -05:00
CitadelStationBot
2d3905457e [MIRROR] Rename Bump to Collide (#2002) 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
 2017-07-14 21:35:56 -07:00
lm40
80d06fe843 Update dogborgstuff.dm (#2013) 2017-07-14 21:35:22 -07:00
CitadelStationBot
bd3c3e9de4 Removes the entry in sound.dm for servostep.ogg (#2004) 2017-07-14 19:35:48 -07:00
CitadelStationBot
6d4c97120f Fixes wallframes (#2001) 2017-07-14 19:35:11 -07:00
CitadelStationBot
a0a77f5a41 Refactors screwdriver coloring to use greyscale (#2003) 2017-07-14 19:34:03 -07:00
CitadelStationBot
51ae2fb9b7 Fixes formatting (#2009) 2017-07-14 19:30:48 -07:00
CitadelStationBot
689142f160 Makes showers clean WASHABLE_COLOUR_PRIORITY (#2007) 2017-07-14 19:30:37 -07:00
CitadelStationBot
cf19d737f1 Automatic changelog generation for PR #2008 [ci skip] 2017-07-14 21:30:18 -05:00
Raeschen
6e72c48115 Added " say_mod = "chirps" " to the avian species entry to allow the say prefix to be "chirps" instead of "says" (#2008) 2017-07-14 19:30:17 -07:00
CitadelStationBot
63ffbdf090 Fixes cleave conditions for the cleaving saw (#2006) 2017-07-14 19:30:06 -07:00
CitadelStationBot
8f120d9008 Automatic changelog generation for PR #2010 [ci skip] 2017-07-14 21:29:56 -05:00
CitadelStationBot
106cdfc37b [MIRROR] Fixes the maid costume's apron (#2010) 
* Fixes the maid costume's apron

* Delete admins.txt.rej
 2017-07-14 19:29:55 -07:00
CitadelStationBot
08b3839fb8 Automatic changelog generation for PR #1999 [ci skip] 2017-07-14 21:28:54 -05:00
ktccd
6d3123f63c Readds borers (#1999) 
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
 2017-07-14 19:28:52 -07:00
CitadelStationBot
9990c0008a Fixes astar pathing thru space when requested not to. (#2011) 2017-07-14 19:28:13 -07:00
LetterJay
df26bdd9cf cleanup 2017-07-14 10:22:43 -05:00
CitadelStationBot
3ee26917bd Organ Update [Cloning isn't broken edition] 2017-07-14 09:00:36 -05:00
CitadelStationBot
eb5cce3b8b Prevents transit turfs from throwing things if it has lattice (#1996) 2017-07-14 03:21:23 -07:00
CitadelStationBot
7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -07:00
CitadelStationBot
03618e7aa4 Raises max lines for piano from 50 to 300 (#1993) 2017-07-14 03:14:07 -07:00
CitadelStationBot
5e079fa54f Welding tools now use overlays for fuel gauges, rather than icons (#1994) 2017-07-14 03:13:55 -07:00
LetterJay
798050317f Merge pull request #1991 from Citadel-Station-13/upstream-merge-28826 
[MIRROR] Adds a 'nemesis faction' system to transforming weapons
 2017-07-13 23:59:06 -05:00
CitadelStationBot
b80344b7e1 Automatic changelog generation for PR #1990 [ci skip] 2017-07-13 23:58:38 -05:00
LetterJay
0c6343c3bc Merge pull request #1990 from Citadel-Station-13/upstream-merge-29197 
[MIRROR] Adds a "synthesizer" that's basically a handheld piano
 2017-07-13 23:58:37 -05:00
LetterJay
9d3c4d4702 Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215 
[MIRROR] Replaces ex_act and emp_act numbers with defines
 2017-07-13 23:57:35 -05:00