6522ca6130
Nuke screwdrivers are no longer randomly colored ( #2110 )
2017-07-24 04:06:16 -07:00
f14fab916b
Supermatter sliver theft now works ( #2115 )
2017-07-24 04:05:55 -07:00
a482eb6d48
Merge pull request #2091 from Citadel-Station-13/upstream-merge-29410
...
[MIRROR] Reviving Stasis now always regenerates all organs
2017-07-23 06:52:56 -05:00
564f1bc533
Merge pull request #2092 from Citadel-Station-13/upstream-merge-29409
...
[MIRROR] Fixes a drone ping issue
2017-07-23 06:52:41 -05:00
6a961f7348
Merge pull request #2093 from Citadel-Station-13/upstream-merge-29401
...
[MIRROR] Ore satchels no longer have infinite capacity
2017-07-23 06:52:26 -05:00
e937aeaa51
Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.)
2017-07-21 18:26:06 -05:00
c8763c994c
Ore satchels no longer have infinite capacity
2017-07-21 18:20:53 -05:00
4fbdf9851d
Fixes a drone ping issue
2017-07-21 18:19:49 -05:00
3085776125
Reviving Stasis now always regenerates all organs
2017-07-21 18:18:45 -05:00
5db90b28dc
Fixes the party alarm ( #2082 )
2017-07-21 07:05:29 -07:00
64f7a14e07
Adds investigate logs to portals
2017-07-20 22:26:01 -05:00
bfcb068f21
Adds proper containers for some locates ( #2080 )
2017-07-20 06:31:25 -07:00
993a1ed152
Merge pull request #2078 from Citadel-Station-13/upstream-merge-29285
...
[MIRROR] Charging the clockwork slab now uses overlays
2017-07-19 13:41:55 -05:00
1e2fd6c235
Merge pull request #2044 from Citadel-Station-13/upstream-merge-29293
...
[MIRROR] Made cell / holding cell windoors their own subtype
2017-07-19 13:41:37 -05:00
cff128c5d5
Merge pull request #2073 from Citadel-Station-13/upstream-merge-29180
...
[MIRROR] Small belt overlay rewrite, and tool overlays for toolbelts
2017-07-19 13:37:25 -05:00
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
79fcbfece6
Charging the clockwork slab now uses overlays
2017-07-19 10:57:09 -05:00
88df8a412d
Fixes Hijack Objective
2017-07-19 10:24:22 -05:00
e6d6478482
Small belt overlay rewrite, and tool overlays for toolbelts
2017-07-19 09:30:06 -05:00
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
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
a7b3516491
Merge pull request #2000 from Citadel-Station-13/upstream-merge-29228
...
[MIRROR] Fixes IV Drips
2017-07-19 05:02:19 -05:00
91a2d1ca0b
Update security.dm
2017-07-19 04:57:45 -05:00
b497ce09ab
Update iv_drip.dm
2017-07-19 04:52:47 -05:00
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
0eacb2c7a8
Merge pull request #2051 from ktccd/Borer-lewds
...
Borer lewds
2017-07-19 04:45:53 -05:00
0b7d08d5ac
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 04:05:53 -05:00
5bb567ecb0
Electric guitars now properly use .ogg sound files
2017-07-18 13:51:25 -05:00
c294d781b6
Fixes flashbang stun times ( #2056 )
2017-07-18 06:14:29 -07:00
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
556a8b7216
Unbreaks turf.empty ( #2053 )
2017-07-18 05:58:27 -07:00
6aeb096054
Updates epinephrine flufftext
...
Updating with less specific epinephrine flufftext.
2017-07-18 14:43:39 +02:00
2d096997bc
removes the 'yiff in hell' graffiti artwork
2017-07-18 05:25:38 -05:00
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
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
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
fbeebdeab9
Merge pull request #2027 from ktccd/Enable-Borer-Random-Event
...
Enable borer random event
2017-07-17 07:46:01 -05:00
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
74e5f80257
Fixes the Ark not pushing stuff away even while waiting for components
2017-07-17 07:16:55 -05:00
c94e598b3f
Minor instrument code cleanup
2017-07-17 07:14:50 -05:00
755de4f223
Made cell / holding cell windoors their own subtype
2017-07-17 06:52:17 -05:00
6f7e908c89
RPDs can now place disposals pipes on dense non-wall turfs ( #2035 )
2017-07-17 00:54:17 -07:00
3066f32215
Improves drone detonation logging ( #2037 )
2017-07-17 00:53:00 -07:00
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
609ae007ae
Changes all access const to be a define
2017-07-16 11:44:47 -05:00
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
f87046aaee
Comments
2017-07-15 23:44:13 +02:00
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
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