shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,720 Commits 5 Branches 0 Tags
79fcbfece601261bfc3abef81e7ea4c88d4da40f
Commit Graph

1091 Commits

Author SHA1 Message Date
CitadelStationBot
79fcbfece6 Charging the clockwork slab now uses overlays 2017-07-19 10:57:09 -05:00
LetterJay
6fe243b647 Merge pull request #2067 from Citadel-Station-13/upstream-merge-29320 
[MIRROR] Electric guitars now properly use .ogg sound files
 2017-07-19 09:21:22 -05:00
LetterJay
7cbdc0e2ae Merge pull request #2070 from Citadel-Station-13/upstream-merge-29356 
[MIRROR] Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
 2017-07-19 05:34:24 -05:00
LetterJay
a7b3516491 Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228 
[MIRROR] Fixes IV Drips
 2017-07-19 05:02:19 -05:00
LetterJay
b497ce09ab Update iv_drip.dm 2017-07-19 04:52:47 -05:00
LetterJay
98c2128386 Merge pull request #2052 from Citadel-Station-13/remove 
removes the 'yiff in hell' graffiti artwork
 2017-07-19 04:46:09 -05:00
LetterJay
0eacb2c7a8 Merge pull request #2051 from ktccd/Borer-lewds 
Borer lewds
 2017-07-19 04:45:53 -05:00
CitadelStationBot
0b7d08d5ac Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc 2017-07-19 04:05:53 -05:00
CitadelStationBot
5bb567ecb0 Electric guitars now properly use .ogg sound files 2017-07-18 13:51:25 -05:00
CitadelStationBot
c294d781b6 Fixes flashbang stun times (#2056) 2017-07-18 06:14:29 -07:00
CitadelStationBot
8d9dc6dd13 [MIRROR] Fixes a ... likely important bug with shuttle code.... (#2061) 
* Fixes a ... likely important bug with shuttle code....

* Delete turf.dm.rej

* Update turf.dm
 2017-07-18 06:01:02 -07:00
CitadelStationBot
556a8b7216 Unbreaks turf.empty (#2053) 2017-07-18 05:58:27 -07:00
ktccd
6aeb096054 Updates epinephrine flufftext 
Updating with less specific epinephrine flufftext.
 2017-07-18 14:43:39 +02:00
LetterJay
2d096997bc removes the 'yiff in hell' graffiti artwork 2017-07-18 05:25:38 -05:00
ktccd
0a6deecb86 Somehow this didn't get in? 
Added camphor also, it was supposed to have been committed already, dang
git-magic!
 2017-07-18 11:13:56 +02:00
ktccd
aa049ce481 Adding citadel chems and flufftext 
Aphrodisiac and Anaphrodisiac added to borer chem list. Now that TG
removed borers, maybe they'll stay on this time.
Also added flufftext for borer_chems, so that there is some kind of
feedback to the host when their borer puts something in them. I'm not
sure what span class should be used, but the chem is usually beneficial
and the only chem that might be dangerous (meth) is not very subtle as
to miss it just because the span class...

Also added snowflake exception for citadel chem flavor text, because
some people/species cannot feel arousal and thus would not notice the
chemical having any effect.
 2017-07-18 10:56:31 +02:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
bbc28aa856 Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049) 2017-07-17 22:51:51 -07:00
LetterJay
fbeebdeab9 Merge pull request #2027 from ktccd/Enable-Borer-Random-Event 
Enable borer random event
 2017-07-17 07:46:01 -05:00
LetterJay
62648534cb Merge pull request #2046 from Citadel-Station-13/upstream-merge-29274 
[MIRROR] Minor instrument code cleanup
 2017-07-17 07:41:59 -05:00
CitadelStationBot
74e5f80257 Fixes the Ark not pushing stuff away even while waiting for components 2017-07-17 07:16:55 -05:00
CitadelStationBot
c94e598b3f Minor instrument code cleanup 2017-07-17 07:14:50 -05:00
CitadelStationBot
6f7e908c89 RPDs can now place disposals pipes on dense non-wall turfs (#2035) 2017-07-17 00:54:17 -07:00
CitadelStationBot
3066f32215 Improves drone detonation logging (#2037) 2017-07-17 00:53:00 -07:00
CitadelStationBot
260a140f97 Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. (#2034) 2017-07-17 00:52:43 -07: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
ktccd
f87046aaee Comments 2017-07-15 23:44:13 +02:00
ktccd
accc12103c Enables Random borer event 
Enables the borer event, from max 0 occurances to max 1 occurance per
round.
Decreases random chance weight of borer event, from 15 down to the
default 10.
Increases minimum players required up from 15 to 20, as the gamemode at
MINIMUM requires 10 living players to greentext anyway and does poorly
on very lowpop rounds.
Earliest start increased from 20 minutes to 40 minutes, as our rounds
lasts longer than TG rounds do.
 2017-07-15 23:44:04 +02: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
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
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07: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
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
689142f160 Makes showers clean WASHABLE_COLOUR_PRIORITY (#2007) 2017-07-14 19:30:37 -07: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
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
1dc34f7383 Fixes IV Drips 2017-07-14 06:38:40 -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
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
CitadelStationBot
92c6b7b445 Adds a 'nemesis faction' system to transforming weapons 2017-07-13 17:46:51 -05:00