Commit Graph

7678 Commits

Author SHA1 Message Date
LetterJay
6cd4e67f36 Update silicon.dm 2017-09-29 23:44:43 -05:00
LetterJay
8e1cbb68ca Update assistant.dm 2017-09-29 23:44:23 -05:00
LetterJay
9da3470521 Update preferences_savefile.dm 2017-09-29 23:44:08 -05:00
LetterJay
03ee5a9303 Update preferences.dm 2017-09-29 23:43:39 -05:00
LetterJay
6fe6cfd68e Update ipintel.dm 2017-09-29 23:42:35 -05:00
LetterJay
eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05:00
ShizCalev
f8f599b17b Stops putting RCD, bluespace bags, and staves into ORM 2017-09-29 19:33:37 -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
Jordan Brown
cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
AnturK
c37f74035e Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00
Jordan Brown
77c2c77f0e Removes a call to datum/New() 2017-09-29 15:59:19 -05:00
oranges
a4992bae90 Log attempted injections as well as successful ones 2017-09-29 15:57:50 -05:00
LetterJay
2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns
Wave 3 of guns
2017-09-29 12:45:52 -04:00
LetterJay
7263926251 Merge pull request #2961 from Citadel-Station-13/upstream-merge-31038
[MIRROR] DisplayTimeText for setup time on login
2017-09-29 12:18:25 -04:00
oranges
ba189c041b Fixes shade attackby 2017-09-29 04:30:50 -05:00
LetterJay
ee0d1f15f8 Merge pull request #3001 from Citadel-Station-13/upstream-merge-31064
[MIRROR] Silver slime extracts create proper fried foods
2017-09-29 01:46:40 -04:00
LetterJay
c2f6c7dbf8 Merge pull request #2998 from Citadel-Station-13/upstream-merge-31063
[MIRROR] Profile access is granted when holder is created
2017-09-29 01:46:05 -04:00
LetterJay
e4e741d924 Merge pull request #2997 from Citadel-Station-13/upstream-merge-31074
[MIRROR] Ninja outfit code cleanup
2017-09-29 01:45:54 -04:00
LetterJay
d535514909 Merge pull request #2994 from Citadel-Station-13/upstream-merge-31061
[MIRROR] Fixes MMI buckled-warning
2017-09-29 01:45:08 -04:00
LetterJay
75359598b3 Merge pull request #2988 from Citadel-Station-13/upstream-merge-31060
[MIRROR] Fixes larva evolving while restrained
2017-09-29 01:43:07 -04:00
LetterJay
80e92ebdc5 Merge pull request #2987 from Citadel-Station-13/upstream-merge-30858
[MIRROR] [READY]Refactors timestops to use fields
2017-09-29 01:42:56 -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
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05: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
Jordan Brown
7621d1da91 Movement delay fixes and optimization 2017-09-28 21:56:52 -05:00
oranges
baf72b8412 Merge pull request #31064 from YPOQ/silverfriedfoods
Silver slime extracts create proper fried foods
2017-09-28 21:55:42 -05:00
Jordan Brown
eb27276765 Profile access is granted when holder is created 2017-09-28 21:53:12 -05:00
oranges
a01540e39b Merge pull request #31074 from pubby/ninjaoutfit
Ninja outfit code cleanup
2017-09-28 21:53:05 -05:00
kingofkosmos
f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
kingofkosmos
977163ae54 Fixes MMI buckled-warning (#31061)
* Fixes MMI having a buckled-warning when trying to move.

* Comment added.
2017-09-28 21:48:35 -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
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
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
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
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
Ashe Higgs
c14fd6741c Adds Nars-Ian and clock hawks 2017-09-28 10:43:32 -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
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
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
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