Commit Graph

1648 Commits

Author SHA1 Message Date
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
8f5d02be55 Merge pull request #2977 from Citadel-Station-13/upstream-merge-31027
[MIRROR] GetAllContents performance increase
2017-09-29 01:41:58 -04:00
LetterJay
cef4ae4fd6 Merge pull request #2975 from Citadel-Station-13/upstream-merge-30661
[MIRROR] Advanced camera consoles use a list for z lock rather than a single z level
2017-09-29 01:41:32 -04:00
LetterJay
02a5c92233 Merge pull request #2974 from Citadel-Station-13/upstream-merge-31046
[MIRROR] AFK players count as dead for the assassinate objective
2017-09-29 01:41:16 -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
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
LetterJay
d25894447e Merge pull request #2971 from Citadel-Station-13/upstream-merge-31048
[MIRROR] Fixed duplicate definition
2017-09-28 12:32:57 -04:00
LetterJay
355b9af67e Merge pull request #2960 from Citadel-Station-13/upstream-merge-30957
[MIRROR] Revheads are now stealthier/harder to metagame
2017-09-28 12:21:53 -04:00
Jordan Brown
a3c7a3fe11 Self replacement fix (#30834) 2017-09-28 11:08:02 -05:00
Emmett Gaines
16f1ceedd1 GetAllContents performance increase (#31027) 2017-09-28 10:44:28 -05:00
KorPhaeron
6fca708b33 Advanced camera consoles use a list for z lock rather than a single z level (#30661)
* Refactor Abductor Console

* Station lock
2017-09-28 10:44:12 -05:00
Y0SH1M4S73R
602e1e6bbf AFK players count as dead for the assassinate objective (#31046) 2017-09-28 10:43:58 -05:00
AutomaticFrenzy
91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
CitadelStationBot
2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967)
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
LetterJay
64ff719843 Merge pull request #2956 from Citadel-Station-13/upstream-merge-30942
[MIRROR] Adds installing cells as part of mech construction and fixes some mech construction bugs.
2017-09-27 23:45:50 -04:00
LetterJay
7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04: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
f3da8a48a0 Update critter.dm 2017-09-27 19:11:11 -05:00
LetterJay
1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
LetterJay
31a9164362 Update combat.dm 2017-09-27 16:27:21 -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
Robustin
f71c3d6614 Revheads are now stealthier/harder to metagame (#30957)
* stealthier revs

* Stealthiest Revheads

* Update revolution.dm
2017-09-27 15:28:35 -05:00
AnturK
ebdea5382b Here it is. 2017-09-27 13:22:16 -05:00
GLACoding
7b3fa9bdb1 Adds installing cells as part of mech construction and fixes some mech construction bugs. 2017-09-27 04:14:22 -05:00
vuonojenmustaturska
10bf80139c Fixes MMI to AI law transfer (#31017)
* Fixes MMI to AI law transfer

* Fixes issue with preloaded laws on AI core
2017-09-26 16:52:17 -05:00
LetterJay
dab03b249d Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992
[MIRROR] Spiderpalooza 1: Foods!
2017-09-26 15:01:02 -04:00
LetterJay
8b37c32a17 Merge pull request #2942 from Citadel-Station-13/upstream-merge-30967
[MIRROR] Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at
2017-09-26 14:59:20 -04: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
Armhulen
a7d0b50808 Spiderpalooza 1: Foods! 2017-09-26 11:32:36 -05:00
vuonojenmustaturska
1aef27a0f0 Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967)
* Jump boots fix

* requested changes

* Requested changes, also whoops
2017-09-26 04:29:18 -05:00
AnturK
fd0bc465cc Refactors cinematics. 2017-09-26 04:20:59 -05:00
LetterJay
8ff51624e1 Merge pull request #2934 from Citadel-Station-13/upstream-merge-30913
[MIRROR] Stops AIs from giving the borg a free secondary light
2017-09-25 13:29:02 -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
45751464e0 Merge pull request #2930 from Citadel-Station-13/upstream-merge-30975
[MIRROR] Href tokens
2017-09-25 13:27:27 -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
KorPhaeron
31f6898a87 Stops AIs from giving the borg a free secondary light (#30913)
* Stops AIs from giving the borg a free secondary light

* Using a camera var now

* Wrong if

* My brain is not working
2017-09-24 17:58:37 -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
pubby
382d549c2f Allow AIs to greentext survive (#30959)
* Change AI objectives from survive to exist

* Cyberboss simplification
2017-09-24 17:38:00 -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
LetterJay
1c9061058f Merge pull request #2928 from Citadel-Station-13/upstream-merge-30899
[MIRROR] Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period
2017-09-24 11:34:01 -04:00