Commit Graph
2628 Commits
Author SHA1 Message Date
nicbnandCitadelStationBot 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
Tad HardestyandCitadelStationBot 20e7f03910 Strip propriety macros from tooltips (#31113) 2017-09-30 08:03:28 -05:00
orangesandCitadelStationBot 384332fe20 Small refactor to movement (#31071)
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.

Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination

Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
2017-09-30 07:23:35 -05:00
LetterJayandGitHub dc2140a88d Update paper.dm 2017-09-30 02:15:40 -05:00
LetterJayandGitHub d7db5f23cb Update humanoid.dm 2017-09-30 02:13:33 -05:00
LetterJayandGitHub ee0c45751b Update simple_animal.dm 2017-09-30 01:45:46 -05:00
LetterJayandGitHub e63f93979f Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
LetterJayandGitHub 8048ce1842 Update humanoid.dm 2017-09-30 01:37:32 -05:00
LetterJayandGitHub 6cd4e67f36 Update silicon.dm 2017-09-29 23:44:43 -05:00
LetterJayandGitHub 8e1cbb68ca Update assistant.dm 2017-09-29 23:44:23 -05:00
LetterJayandGitHub 9da3470521 Update preferences_savefile.dm 2017-09-29 23:44:08 -05:00
LetterJayandGitHub 03ee5a9303 Update preferences.dm 2017-09-29 23:43:39 -05:00
LetterJayandGitHub 6fe6cfd68e Update ipintel.dm 2017-09-29 23:42:35 -05:00
LetterJayandGitHub eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05:00
ShizCalevandCitadelStationBot f8f599b17b Stops putting RCD, bluespace bags, and staves into ORM 2017-09-29 19:33:37 -05:00
ShizCalevandCitadelStationBot 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 BrownandCitadelStationBot cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
AnturKandCitadelStationBot c37f74035e Fixes evidence bag not respecting inventory 2017-09-29 16:00:30 -05:00
Jordan BrownandCitadelStationBot 77c2c77f0e Removes a call to datum/New() 2017-09-29 15:59:19 -05:00
orangesandCitadelStationBot a4992bae90 Log attempted injections as well as successful ones 2017-09-29 15:57:50 -05:00
LetterJayandGitHub 2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns
Wave 3 of guns
2017-09-29 12:45:52 -04:00
LetterJayandGitHub 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
orangesandCitadelStationBot ba189c041b Fixes shade attackby 2017-09-29 04:30:50 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 BrownandCitadelStationBot 116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
ShizCalevandCitadelStationBot 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 BrownandCitadelStationBot 7621d1da91 Movement delay fixes and optimization 2017-09-28 21:56:52 -05:00
orangesandCitadelStationBot baf72b8412 Merge pull request #31064 from YPOQ/silverfriedfoods
Silver slime extracts create proper fried foods
2017-09-28 21:55:42 -05:00
Jordan BrownandCitadelStationBot eb27276765 Profile access is granted when holder is created 2017-09-28 21:53:12 -05:00
orangesandCitadelStationBot a01540e39b Merge pull request #31074 from pubby/ninjaoutfit
Ninja outfit code cleanup
2017-09-28 21:53:05 -05:00
kingofkosmosandCitadelStationBot f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
kingofkosmosandCitadelStationBot 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
YPOQandCitadelStationBot a780d6f79e Fixes larva evolving while restrained (#31060) 2017-09-28 21:46:43 -05:00
kevinz000andCitadelStationBot 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 BrownandCitadelStationBot e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Daniel0MclovinandGitHub 7054cf01ea changed a few 1's to TRUE's, removed food prefs 2017-09-28 20:02:17 -05:00
XDTMandCitadelStationBot 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
LetterJayandGitHub 3e27458d11 Merge pull request #2968 from Augustfox/master
Organize hair and facial hair in character creation
2017-09-28 12:29:10 -04:00
LetterJayandGitHub 4e19b5a5f8 Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041
[MIRROR] Removes some spawns
2017-09-28 12:25:33 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
KorPhaeronandCitadelStationBot 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 HiggsandCitadelStationBot c14fd6741c Adds Nars-Ian and clock hawks 2017-09-28 10:43:32 -05:00
Jordan BrownandCitadelStationBot 97b8a6ed3b Removes some spawns 2017-09-28 10:43:07 -05:00