cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-12 19:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,434 Commits 55 Branches 0 Tags
cf83d3410b51b6cc14fac3c01d5a8d2f9c263e14
Commit Graph

3328 Commits

Author SHA1 Message Date
LetterJay
cf83d3410b Merge pull request #3797 from Citadel-Station-13/upstream-merge-32329 
[MIRROR] Some improvements on the holiday system
 2017-11-04 22:49:49 -05:00
LetterJay
4bf6f81fd9 Merge pull request #3793 from Citadel-Station-13/upstream-merge-32362 
[MIRROR] Improves hotspot code
 2017-11-04 22:48:34 -05:00
LetterJay
74706b1eea Merge pull request #3791 from Citadel-Station-13/upstream-merge-32367 
[MIRROR] Adds 'round' chat command
 2017-11-04 22:47:48 -05:00
LetterJay
39692c6134 Merge pull request #3790 from Citadel-Station-13/upstream-merge-32354 
[MIRROR] Woody golems get woody names.
 2017-11-04 22:47:34 -05:00
LetterJay
9b9aa323c5 Merge pull request #3789 from Citadel-Station-13/upstream-merge-32233 
[MIRROR] Allows cyborgs to perform limb augmentation
 2017-11-04 22:46:45 -05:00
LetterJay
b1c859b988 Merge pull request #3788 from Citadel-Station-13/upstream-merge-32327 
[MIRROR] Add off switch to holodeck
 2017-11-04 22:46:09 -05:00
LetterJay
dd32227946 Merge pull request #3786 from Citadel-Station-13/upstream-merge-32346 
[MIRROR] removes lesser drake crusher loot
 2017-11-04 22:45:17 -05:00
LetterJay
03a0057609 Merge pull request #3785 from Citadel-Station-13/upstream-merge-32384 
[MIRROR] Hopefully fixes guest accounts being able to log in
 2017-11-04 22:45:00 -05:00
LetterJay
113e3a5b53 Merge pull request #3783 from Citadel-Station-13/upstream-merge-32358 
[MIRROR] Dullahan Fixes
 2017-11-04 22:44:23 -05:00
LetterJay
6490ac4472 Merge pull request #3781 from Citadel-Station-13/upstream-merge-32338 
[MIRROR] Fixes hotspot runtime
 2017-11-04 22:41:42 -05:00
LetterJay
c3aa4c5929 Merge pull request #3778 from Citadel-Station-13/upstream-merge-32350 
[MIRROR] Fixes shuttle parallax again
 2017-11-04 22:33:30 -05:00
LetterJay
9c6a165de6 Merge pull request #3777 from Citadel-Station-13/upstream-merge-32347 
[MIRROR] Proper and improper macros are removed before sending to irc
 2017-11-04 22:32:15 -05:00
LetterJay
1c131962d4 Merge pull request #3745 from Citadel-Station-13/upstream-merge-32269 
[MIRROR] Makes enterTransit check canMove and sets mode to idle
 2017-11-04 22:31:17 -05:00
tortellinitony
3772d722e2 Some improvements on the holiday system (#32329) 2017-11-03 23:37:16 -05:00
Leo
5ca11c1db3 Merge pull request #32362 from tgstation/Cyberboss-patch-2 
Improves hotspot code
 2017-11-03 17:39:30 -05:00
Leo
1db88cecb2 Merge pull request #32367 from tgstation/Cyberboss-patch-3 
Adds 'round' chat command
 2017-11-03 17:36:09 -05:00
Armhulen
056594114f Woody golems get woody names. (#32354) 
* ya, that'll do em.

* we all make mistakes

* heat signature is a great game

* it's aliiiiive

* caving: the commit
 2017-11-03 17:01:24 -05:00
swindly
4f04256e46 Allows cyborgs to perform limb augmentation (#32233) 
* allows organ storage bags to be used to augment limbs

* replaces hardcoded stuff with intiial()
 2017-11-03 15:55:12 -05:00
Tad Hardesty
2ad20f9a27 Add off switch to holodeck (#32327) 
"Holodeck - Offline" is now a selectable program and correctly reverts
the holodeck and uses no power.
 2017-11-03 15:55:03 -05:00
imsxz
a509a99b52 crusher loot fix (#32346) 2017-11-03 15:54:44 -05:00
Jordan Brown
b3bf2276ff Merge pull request #32384 from McBawbaggings/tgfix 
Hopefully fixes guest accounts being able to log in
 2017-11-03 15:54:36 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358) 
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
 2017-11-03 15:54:19 -05:00
oranges
1c60983624 Merge pull request #32338 from AnturK/hotspotfix 
Fixes hotspot runtime
 2017-11-03 15:54:02 -05:00
Emmett Gaines
b97e1741df fixes shuttle parallax again (#32350) 2017-11-03 15:53:34 -05:00
Leo
ada8ad0ead Proper and improper macros are removed before sending to irc (#32347) 
* Proper and improper macros are removed before sending to irc

* Removes leftover check
 2017-11-03 15:53:26 -05:00
LetterJay
33d861608a Merge pull request #3771 from Citadel-Station-13/upstream-merge-32219 
[MIRROR] Adds new canister sprites
 2017-11-03 00:16:08 -05:00
LetterJay
2fe152fcf4 Merge pull request #3766 from Citadel-Station-13/upstream-merge-32353 
[MIRROR] Fixes atmos.
 2017-11-03 00:14:16 -05:00
LetterJay
02a0da9c38 Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640 
[MIRROR] [Ready]Ghosts can now Health Scan
 2017-11-03 00:13:58 -05:00
LetterJay
e43e73c0c1 Merge pull request #3764 from Citadel-Station-13/upstream-merge-32243 
[MIRROR] [s] New blob overminds off the station Z level are moved to the station
 2017-11-03 00:13:37 -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
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
eca7f03c94 Merge pull request #3757 from Citadel-Station-13/upstream-merge-32312 
[MIRROR] nerfs flightsuit zoom
 2017-11-03 00:11:37 -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
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
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -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
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
kevinz000
f7c5196954 nerf flight vision (#32312) 2017-11-02 04:08:51 -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
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
Leo
a9ef812497 Merge pull request #32289 from AutomaticFrenzy/patch/nukies 
Fix quick-create nuke team
 2017-11-01 21:38:29 -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
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