LetterJay
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
LetterJay
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
LetterJay
10b530920b
Merge pull request #3015 from Citadel-Station-13/upstream-merge-31111
...
[MIRROR] Fixes SM shard extraction
2017-09-30 12:57:33 -04:00
nicbn
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
LetterJay
b5cdb64a53
Update extinguisher.dm
2017-09-30 01:44:31 -05:00
ShizCalev
c54ea1b9bf
Fixes SM shard extraction ( #31111 )
...
* Fixes SM shard extraction
* Space-OSHA called. They want to have a word.
2017-09-29 18:43:41 -05:00
LetterJay
e8f581bb56
Merge branch 'master' into upstream-merge-31077
2017-09-29 12:46:25 -04:00
LetterJay
a12df2019f
Merge pull request #2966 from Citadel-Station-13/upstream-merge-31024
...
[MIRROR] Air tanks get their own sprite, plus reset fix.
2017-09-29 12:19:27 -04:00
LetterJay
c80237c969
Update tank_types.dm
2017-09-29 00:48:53 -05:00
LetterJay
2d1d0b7fd8
Update tank_types.dm
2017-09-29 00:48:01 -05:00
LetterJay
1715845fe1
Merge pull request #2990 from Citadel-Station-13/upstream-merge-31081
...
[MIRROR] You can now light cigars on burning people
2017-09-29 01:43:59 -04:00
LetterJay
c8a03440cb
Merge pull request #2978 from Citadel-Station-13/upstream-merge-30834
...
[MIRROR] Self replacement fix
2017-09-29 01:42:17 -04:00
LetterJay
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
LetterJay
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
LetterJay
157d9cc6e6
Merge pull request #2982 from Citadel-Station-13/upstream-merge-30864
...
[MIRROR] Secure containers give more hints, no RNG, for hacking
2017-09-29 01:39:03 -04:00
ShizCalev
9da41c3596
Stops revheads from being metagamed with healthscanners & medical HUDs. ( #31110 )
...
* Stops revheads metagaming
* Added comment.
2017-09-28 22:00:16 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
RandomMarine
dd7fd8b4a8
You can now light cigars on burning people ( #31081 )
...
* adds lighting cigs on burning mobs
* backslash the
* src
2017-09-28 21:46:57 -05:00
Tungsten
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
oranges
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
Robustin
3fe37eb41b
Secure containers give more hints, no RNG, for hacking ( #30864 )
...
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Removes bad RNG
* More instructions
* gud grammer
* Right parenthesis
* Update secure.dm
* Update secure.dm
* Update secure.dm
* less explicit
2017-09-28 21:41:07 -05:00
Jordan Brown
a3c7a3fe11
Self replacement fix ( #30834 )
2017-09-28 11:08:02 -05:00
Jordan Brown
8f600788f4
Back and inhands for air tanks.
2017-09-28 10:44:20 -05:00
AutomaticFrenzy
91c1a78af9
Fixed duplicate definition ( #31048 )
2017-09-28 10:43:24 -05:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJay
e1c103116e
Update toolbox.dm
2017-09-27 17:35:52 -05:00
LetterJay
6402ee86e0
Update belt.dm
2017-09-27 17:35:33 -05:00
RandomMarine
ab28e2facb
Air tanks get their own sprite, plus reset fix.
2017-09-27 15:45:41 -05:00
LetterJay
18545eb41c
Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
...
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
Ashe Higgs
e575bd6685
(Ready) Clockwork Cult Rework: Proof-of-concept
2017-09-26 15:22:09 -05:00
LetterJay
47a8ce6ae8
Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863
...
[MIRROR] Bluespace pipes
2017-09-26 14:58:23 -04:00
Jordan Brown
0a43bddaa1
Merge pull request #30863 from pubby/bluepipe
...
Bluespace pipes
2017-09-25 12:28:14 -05:00
LetterJay
8fd6d9d883
Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980
...
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-25 13:28:05 -04:00
LetterJay
d8736482fd
Update transfer_valve.dm
2017-09-25 11:55:09 -05:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
vuonojenmustaturska
11a3395690
Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-24 17:42:13 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
LetterJay
e16d89d077
Merge pull request #2923 from jughu/hi-hello
...
Allows custom renaming for holy weapons
2017-09-24 15:49:19 -04:00
MoreRobustThanYou
df607bb24c
Implant Chairs now also support organs ( #30982 )
...
* Implant Chairs now also support organs
* Update implantchair.dm
* Update implantchair.dm
2017-09-24 11:55:22 -05:00
jughu
617eb4c889
The new hip
2017-09-24 01:04:39 +02:00
jughu
5b1b550c0e
Update holy_weapons.dm
2017-09-24 00:34:24 +02:00
Robustin
894673ef97
Fixes revolutionary deconversion messages and logging
2017-09-23 11:07:05 -05:00
CitadelStationBot
222274d108
[MIRROR] Using a soulstone on somebody now transfers your languages to the shade ( #2911 )
...
* Merge pull request #30939 from MoreRobustThanYou/patch-8
Using a soulstone on somebody now transfers your languages to the shade
* Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 05:53:56 -05:00
CitadelStationBot
a286d0c313
[MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction ( #2875 )
...
* Gives engineering cyborgs an item they can use in place of circuits for basic construction
* fixes
2017-09-22 23:35:54 -05:00
CitadelStationBot
eb36f34267
[MIRROR] Specifies one format of variable declaration for the codebase. ( #2895 )
...
* Specifies one format of variable declaration for the codebase.
* dumb mirroring
2017-09-22 23:35:36 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
CitadelStationBot
2757fae7e2
[MIRROR] Fixes shaving headless mobs ( #2890 )
...
* Fixes shaving headless mobs
* Update cosmetics.dm
2017-09-22 22:31:54 -05:00
CitadelStationBot
2c78f7122c
[MIRROR] Adds some new plushies ( #2866 )
...
* Adds some new plushies
* Update packs.dm
2017-09-22 22:31:07 -05:00
CitadelStationBot
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
