355de66eeb
Allows non-humans to be chem scanned via the health analyzer ( #32457 )
2017-11-07 08:02:22 -06:00
d04b5cbeef
Ghosts can now Health Scan ( #31640 )
...
* Ghosts can now Health Scan
* cyberbossing
* Update observer.dm
2017-11-02 08:46:42 -05:00
6ba4300f6e
Merge pull request #3696 from Citadel-Station-13/upstream-merge-32212
...
[MIRROR] fixes radios being perma-stuck on when emped
2017-10-31 02:59:32 -04:00
0efaf92b6f
fixes radios being perma-stuck on when emped ( #32212 )
...
* fix radio emps
* woops forgot something!
* Update headset.dm
2017-10-30 14:38:46 -05:00
119129a80c
Adds force to items that really should hurt when hit by ( #32200 )
2017-10-29 18:49:48 -05:00
819244575d
Spooky Spectral Instruments ( #31966 )
...
* [dooting intensifies]
Spectral Instruments added
To be used with Spooky Skeletons.
* Spectral Re-balance
The spectral instruments no longer stun living creatures.
Text make you retain your loyalties now.
* Requested Changes
Added variable "too_spooky".
Defines if it will spawn a new instrument.
Re-balanced damage to 5 hits average per conversion.
Added admin notice to changelog.
* Loyalty text fix
* Spooky Trumpets
Removed comment.
Added missing spookiness.
* Spooky Dooting
Major Overhaul.
removed /brass/
Spooky Dooting is now a component.
Boneless humanoids no longer lose stamina.
* Spooky Dooting
mk2
2017-10-29 07:35:16 -05:00
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
9076721384
Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842
...
[MIRROR] GPS renaming fix
2017-10-19 09:05:18 -04:00
29e20a55de
Merge pull request #31842 from GunHog/GPS_Name_Fix
...
GPS renaming fix
2017-10-18 07:23:31 -05:00
060d43768e
Merge pull request #31836 from AnturK/pdalogfix
...
Fixes recipient in pda logs
2017-10-18 07:23:12 -05:00
f205911b5a
Adds defines for organ slots
2017-10-15 19:34:42 -05:00
45619b0e1b
Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601
...
[MIRROR] Fix many instances of "the the"
2017-10-14 15:37:00 -04:00
0397bd57c1
Merge pull request #3377 from Citadel-Station-13/upstream-merge-31604
...
[MIRROR] Adds Toggle Underline button to PDA menu
2017-10-14 10:21:19 -04:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
482e61a57e
Adds Toggle Underline button to PDA menu ( #31604 )
...
* Add Toggle Underline button to PDA.dm
-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.
* Changed 1/0 to bools
Now using TRUE and FALSE, also cleaned some HTML I missed the first time
2017-10-13 16:51:44 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
01ecdff51a
Improve extended examination text for many objects ( #31381 )
...
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
fb60efeacb
Fixes shock collars getting stuck in pockets.
2017-10-09 22:45:02 -07:00
af077de46c
TTV code cleanup ( #31262 )
...
* Update transfer_valve.dm
* Update transfer_valve.dm
* Update transfer_valve.dm
* Update transfer_valve.dm
* Update transfer_valve.dm
2017-10-08 01:04:52 -05:00
39d3897b29
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-06 09:39:20 -04:00
63aa1c7153
Makes the pda font a prefernce
2017-10-04 19:28:57 -05:00
5cefa71992
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-10-04 20:18:03 -04:00
719b433ede
Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179
...
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
2017-10-04 02:14:07 -04:00
1782fbeed7
Adds the advanced medical scanner, gives one to the CMO
2017-10-03 18:16:29 -05:00
ba99e3845a
Added normal collar functionality.
...
You can now name your victim's collars on top of other functionality.
2017-10-03 12:12:52 -07:00
f4ce4a3a27
Shock Collars Are Now A Thing.
...
Exactly what it says on the tin.
2017-10-03 08:03:03 -07:00
8e65f4fb23
Merge branch 'master' into crewobjectivesandmiscreants
2017-10-01 23:45:49 +00:00
82981339ed
Adds desc to things lacking them.
2017-10-01 15:07:37 -05:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
f1858a3a63
Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
...
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
078128aa91
Paper markdown ( #30873 )
...
* why it doesn't work
* list thing
* oops
* fixes list. maybe
* Less regex
* wip
* Done I think. I think
* return your functions
* Replace $10 by $a
2017-09-30 08:11:01 -05:00
595f2cb08f
Merge pull request #2983 from Citadel-Station-13/upstream-merge-30985
...
[MIRROR] Fixes frozen PDAs in the game logs
2017-09-29 01:39:50 -04:00
4af02dff06
Merge pull request #2984 from Citadel-Station-13/upstream-merge-30613
...
[MIRROR] Applying PDA overhaul Upstream
2017-09-29 01:39:28 -04:00
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
c6c6f67d03
Applying PDA overhaul Upstream ( #30613 )
...
* Applying PDA overhaul Upstream
Yeet?
* Used lordpidey's change
Like this?
* The build failed so I'm changing it back
* Update PDA.dm
* Update PDA.dm
* Make the settings visible only on the main screen
mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.
* Update PDA.dm
* Update PDA.dm
* Wait, I'm an idiot. I was editing the wrong thing.
* Here's your switch statements boi
* Declare font_index at the "Toggle_Font" code
I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.
* Replaced it where it was
cuz the build broke
* Make the color changer a picker instead of a field
An attempt
* Made these defines
@optimumtact @Cyberboss Like this?
2017-09-28 21:43:32 -05:00
367fcc9974
Merge pull request #30985 from tgstation/Cyberboss-patch-5
...
Fixes frozen PDAs in the game logs
2017-09-28 21:42:20 -05:00
9bdc80ba82
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
2017-09-27 23:44:22 -04:00
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
0a43bddaa1
Merge pull request #30863 from pubby/bluepipe
...
Bluespace pipes
2017-09-25 12:28:14 -05:00
d8736482fd
Update transfer_valve.dm
2017-09-25 11:55:09 -05:00
vuonojenmustaturska