Commit Graph

5103 Commits

Author SHA1 Message Date
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
YPOQ a780d6f79e Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:43 -05:00
kevinz000 724fa8ce54 [READY]Refactors timestops to use fields (#30858)
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
2017-09-28 21:46:34 -05:00
pubby 3c769e323e Remove unused ninja team var 2017-09-28 21:45:02 -05:00
kevinz000 df16529ed3 Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas. (#30722)
* initial commit

* bugfix

* Update changeling.dm

* Update datum_traitor.dm

* Update datum_traitor.dm

* Update objective.dm

* compile
2017-09-28 21:44:42 -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 e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Daniel0Mclovin 7054cf01ea changed a few 1's to TRUE's, removed food prefs 2017-09-28 20:02:17 -05:00
deathride58 e81d692b8c adds research objective for scientists 2017-09-28 20:30:53 -04:00
deathride58 77048785cd gives miners a quest for fat stacks 2017-09-28 19:53:11 -04:00
deathride58 bf3644d64e adds points objective for cargonians 2017-09-28 19:41:13 -04:00
deathride58 de15e8fa6b Fixes reporter objective 2017-09-28 19:08:35 -04:00
XDTM 9b5a2f7490 Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow 2017-09-28 16:02:31 -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 207e7d8f71 Merge pull request #2970 from Citadel-Station-13/upstream-merge-31042
[MIRROR] Fixes SSqueak/Initialize() not returning ..()
2017-09-28 12:29:22 -04:00
LetterJay 3e27458d11 Merge pull request #2968 from Augustfox/master
Organize hair and facial hair in character creation
2017-09-28 12:29:10 -04:00
LetterJay 4e19b5a5f8 Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041
[MIRROR] Removes some spawns
2017-09-28 12:25:33 -04:00
LetterJay e6356d2560 Merge pull request #2955 from Citadel-Station-13/upstream-merge-31020
[MIRROR] Variants will not be spawned by gold cores
2017-09-28 12:22:44 -04:00
LetterJay b2682b401c Merge pull request #2963 from Citadel-Station-13/upstream-merge-31035
[MIRROR] Makes the mining vendor give more verbose feedback
2017-09-28 12:22:10 -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
Jordan Brown 8f600788f4 Back and inhands for air tanks. 2017-09-28 10:44:20 -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
AnturK 60952bfb83 Fixes transitions (#31084)
* Fixes transitions

* Cautionary comment.
2017-09-28 10:43:50 -05:00
Ashe Higgs c14fd6741c Adds Nars-Ian and clock hawks 2017-09-28 10:43:32 -05:00
AutomaticFrenzy 91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
Jordan Brown 659c92a0d6 Fixes SSqueak not returning ..() 2017-09-28 10:43:16 -05:00
Jordan Brown 97b8a6ed3b Removes some spawns 2017-09-28 10:43:07 -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
CitadelStationBot 4f281e5ea1 [MIRROR] Blackbox stat for internet midis (#2964)
* Blackbox stat for internet midis

* Blackbox stat for internet midis
2017-09-28 05:56:26 -07:00
deathride58 3711461873 makes the nukedisk objective exclusive to captain 2017-09-28 01:32:58 -04:00
deathride58 226ad9ddde adjustments 2017-09-28 01:10:42 -04:00
Augustfox 612707c999 Alphabetize hair and facial hair in char creation
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
2017-09-27 23:45:15 -05:00
LetterJay 9309f1e3b4 Update clock_components.dm 2017-09-27 23:40:49 -05:00
deathride58 43574eefe1 adds chaplain and curator objectives 2017-09-28 00:30:38 -04: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
deathride58 9bdc80ba82 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-09-27 23:44:22 -04:00
LetterJay a8043202c2 Update golems.dm 2017-09-27 22:43:57 -05:00
LetterJay 3687ef2d33 Update ark_of_the_clockwork_justicar.dm 2017-09-27 22:43:32 -05: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 68f3b5e719 Update time.dm 2017-09-27 19:10:26 -05:00
LetterJay 4f85246e42 Update robot_modules.dm 2017-09-27 18:42:06 -05:00
LetterJay 35761abdc8 Update robot_modules.dm 2017-09-27 18:40:46 -05:00