Commit Graph

5793 Commits

Author SHA1 Message Date
LetterJay
8d1a80d047 Merge pull request #3763 from Citadel-Station-13/upstream-merge-32270
[MIRROR] You can now use banhammers as a weapon
2017-11-03 00:13:17 -05:00
LetterJay
8006c60784 Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284
[MIRROR] Fix a few syntactic aberrations
2017-11-03 00:13:00 -05:00
LetterJay
57655dfd60 Merge pull request #3760 from Citadel-Station-13/upstream-merge-32290
[MIRROR] fixes being able to recharge an object with an inducer while inside the object
2017-11-03 00:12:22 -05:00
LetterJay
9b61dabb67 Merge pull request #3759 from Citadel-Station-13/upstream-merge-32303
[MIRROR] Spamming runes / battlecries / etc will no longer trigger spam prevention
2017-11-03 00:12:12 -05:00
LetterJay
443b49f7f2 Merge pull request #3758 from Citadel-Station-13/upstream-merge-32306
[MIRROR] Fix double progress bars when digging basalt
2017-11-03 00:11:51 -05:00
LetterJay
eca7f03c94 Merge pull request #3757 from Citadel-Station-13/upstream-merge-32312
[MIRROR] nerfs flightsuit zoom
2017-11-03 00:11:37 -05:00
LetterJay
dea89c9e01 Merge pull request #3756 from Citadel-Station-13/upstream-merge-32309
[MIRROR] Makes walls call parent
2017-11-03 00:11:29 -05:00
LetterJay
05e71b2987 Merge pull request #3748 from Citadel-Station-13/upstream-merge-32273
[MIRROR] [s] Adds admin logging to clockwork ark activation
2017-11-02 23:51:39 -05:00
LetterJay
5b890dc8a6 Merge pull request #3749 from Citadel-Station-13/upstream-merge-32288
[MIRROR] Fixes hand tele adjacent attacks teleporting you
2017-11-02 23:50:38 -05:00
deathride58
3f9e54703a fixes character preview icon directions in ONE LINE (#32332) 2017-11-02 20:24:03 -05:00
Emmett Gaines
ec597c411e Signal redirection component (#32298)
* redirection component

* makes register signal accept callbacks

* this is a very lightweight component
2017-11-02 16:05:04 -05:00
nicbn
065957c0e5 Adds new canister sprites (#32219)
* Gas rename

* and this

* and the comments

* nonitrous

* reverts ren

* really reverts it

* reverts some whitespace

* Update airalarm.dm

* Update canister.dm

* come on travis recompile
2017-11-02 15:01:54 -05:00
Jalleo
76bce07100 Refactors the RCD code a tiny bit. One minor balance change (#32328)
* Refactors the RCD code a tad to remove a variable from all RCD's and instead get the reinf_walls.dm checks to be a compiled check with a istype.

* Reverts back to variables for the reinforced walls check. Still reduced the amount of nessecary lines for it though
2017-11-02 13:55:46 -05:00
Mercenaryblue
67a91aaf41 Hotel Security spellchecked (#32313)
* spellcheck

interests

* spellcheck
2017-11-02 13:29:15 -05:00
AnturK
b2e37c8799 Fixes atmos. 2017-11-02 11:46:14 -05:00
XDTM
d04b5cbeef Ghosts can now Health Scan (#31640)
* Ghosts can now Health Scan

* cyberbossing

* Update observer.dm
2017-11-02 08:46:42 -05:00
MoreRobustThanYou
07efcb0425 [s] New blob overminds off the station Z level are moved to the station (#32243)
* [s] New blob overminds are now placed at normal blob spawn points

* Update transform_procs.dm
2017-11-02 04:30:18 -05:00
MoreRobustThanYou
4c857e446a You can now use banhammers as a weapon (#32270)
* You can now use banhammers as a weapon

* Update weaponry.dm
2017-11-02 04:26:06 -05:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
LetterJay
18e4c1c6a0 Merge pull request #3754 from Citadel-Station-13/upstream-merge-32282
[MIRROR] Fix ghosts causing portals to spark
2017-11-02 04:20:43 -05:00
LetterJay
4af81f0a3a Merge pull request #3750 from Citadel-Station-13/upstream-merge-32289
[MIRROR] Fix quick-create nuke team
2017-11-02 04:17:46 -05:00
LetterJay
98801925d0 Merge pull request #3746 from Citadel-Station-13/upstream-merge-32266
[MIRROR] Fixes hallucination alerts not clearing up properly.
2017-11-02 04:17:30 -05:00
kevinz000
82e1d1ac35 fixes inducers working from inside things (#32290) 2017-11-02 04:15:29 -05:00
MoreRobustThanYou
41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303)
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
2017-11-02 04:13:18 -05:00
Tad Hardesty
6f06e690a4 Fix double progress bars when digging basalt (#32306) 2017-11-02 04:11:07 -05:00
kevinz000
f7c5196954 nerf flight vision (#32312) 2017-11-02 04:08:51 -05:00
Emmett Gaines
eb52a61437 makes walls call parent (#32309) 2017-11-02 04:08:44 -05:00
CitadelStationBot
0796b5d503 Merge pull request #3742 from Citadel-Station-13/upstream-merge-31939
[MIRROR] Adds customizable sound emitters for admin use
2017-11-02 04:07:57 -05:00
CitadelStationBot
429961fcea Merge pull request #3741 from Citadel-Station-13/upstream-merge-32271
[MIRROR] Rename brown gas to nitryl
2017-11-02 04:07:48 -05:00
CitadelStationBot
6a796ac32a Merge pull request #3739 from Citadel-Station-13/upstream-merge-32274
[MIRROR] Ark examine now uses DisplayTimeText
2017-11-02 04:07:23 -05:00
CitadelStationBot
6d8072e106 Merge pull request #3738 from Michiyamenotehifunana/recolorables-polish
Polishes code for cit's recolorable assets
2017-11-02 04:07:11 -05:00
CitadelStationBot
b93d28d9aa Merge pull request #3736 from Citadel-Station-13/upstream-merge-32252
[MIRROR] Reflector fixes and improvements
2017-11-02 04:07:01 -05:00
CitadelStationBot
9bda3f16c2 Merge pull request #3735 from Citadel-Station-13/upstream-merge-31942
[MIRROR] Shuttle rotation refactor and significant performance upgrade
2017-11-02 04:06:31 -05:00
LetterJay
d0c1964181 Update shuttle.dm 2017-11-02 02:21:40 -05:00
Tad Hardesty
4e0a5bf3de Fix ghosts causing portals to spark 2017-11-02 01:24:50 -05:00
MoreRobustThanYou
6fbb326242 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 21:38:43 -05:00
Leo
a9ef812497 Merge pull request #32289 from AutomaticFrenzy/patch/nukies
Fix quick-create nuke team
2017-11-01 21:38:29 -05:00
Leo
cf6ee8d4c2 Merge pull request #32288 from kevinz000/patch-369
Fixes hand tele adjacent attacks teleporting you
2017-11-01 21:38:21 -05:00
kevinz000
fea6b185b0 Adds admin logging to clockwork ark activation (#32273) 2017-11-01 21:38:14 -05:00
oranges
d56e7c8c56 Merge pull request #32266 from AnturK/halalert
Fixes hallucination alerts not clearing up properly.
2017-11-01 21:37:57 -05:00
oranges
eb7ee7fb58 Merge pull request #32269 from ninjanomnom/cargo-shuttle-moblock
Makes enterTransit check canMove and sets mode to idle
2017-11-01 21:37:50 -05:00
Ashe Higgs
cd13cfcfe7 Abscond and rifts return servants directly to the Ark (#32257)
🆑 Xhuis
tweak: Abscond and Reebe rifts now place servants directly at the Ark instead of below the "base" area.
/🆑

A few times, I've seen players unwittingly build defenses on top of the spawn points for themselves! While that's not too much of a problem in of itself, I feel that this way makes more sense and lets servants have a consistent area they know they will emerge from.
2017-11-01 21:37:43 -05:00
Ashe Higgs
045d34aa13 Adds customizable sound emitters for admin use (#31939)
When I ran the Colosseum of Fools event a while ago, I used sounds I had locally to spice up the event and make it unique, but I ran into the issue of there being no easy way to play sounds in flexible ways while preventing people who don't want to hear them from being included.

Adds sound emitter objects, editable by admins through a handy UI, that allows them to play sounds in a variety of flexible ways. The following things can be manipulated by any admin by clicking on the sound emitter:

Label (maptext)

Sound File is chosen by navigating to the file like normal sound playing

Sound Volume is a percentage between 1 and 100

Mode dictates how the sound is played and can either be local (played at that location like a normal in-game sound) or direct (played directly to players like admin sounds)

Range dictates how far players need to be to hear the sound; this includes Radius (all players within a specified amount of tiles), Z-Level (all players on the same z-level), and Global (all players.)

Sound emitters can be examined by any ghosts (they're invisible to normal players) to see the info about them, but only admins can edit their properties and play sounds with them.

This lets admins make very flexible sound emitters that can fulfill a variety of different purposes, like music that only people within 7 tiles can hear or a distant screech of metal that an entire search party on the derelict hears.

In addition to the Play Sound button, alt-clicking the emitter activates it.
2017-11-01 21:37:28 -05:00
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
MoreRobustThanYou
ebc768e31b Ark examine now uses DisplayTimeText (#32274)
* Ark examine now uses DisplayTimeText
2017-11-01 21:36:54 -05:00
LetterJay
2f205af2ac Update preferences.dm (#3691) 2017-11-01 11:38:44 -07:00
Michiyamenotehifunana
d7e0857716 Polishes code for recolorable assets
Moves things around a bit to hopefully be more optimized and have lower chance of breaking
2017-11-01 23:33:24 +08:00
LetterJay
d9a29dbda2 Merge branch 'master' into upstream-merge-32307 2017-11-01 07:22:39 -04:00
LetterJay
84c2be8e2f Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251
[MIRROR] Nerfs peaceborg chain bucklestun
2017-11-01 01:44:55 -04:00
LetterJay
06d6361c98 Merge pull request #3732 from Citadel-Station-13/upstream-merge-32145
[MIRROR] Fixes a camera issue with scout holoparasites
2017-11-01 01:44:27 -04:00