Commit Graph
1124 Commits
Author SHA1 Message Date
LetterJayandGitHub 81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
LetterJayandGitHub 8be007225b Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
LetterJay 747312cb6d updates 2017-10-01 00:59:59 -05:00
LeoandCitadelStationBot 318d28976f Merge pull request #31143 from praisenarsie/patch-2
adds a space
2017-09-30 21:45:47 -05:00
ShizCalevandCitadelStationBot 2635689e79 Cleans up some antag/event landmark checks 2017-09-30 21:33:13 -05:00
LeoandCitadelStationBot fd7c9110ca Structure istype define 2017-09-30 21:31:57 -05:00
MoreRobustThanYouandCitadelStationBot e63e05255f Fixes cogscarab sprites not updating (#31142)
* Fixes cogscarab sprites now updating

* fix spacing

* Update extra_drone_types.dm
2017-09-30 21:30:48 -05:00
vuonojenmustaturskaandCitadelStationBot e8a1ceffcb Speeds up simple_animals/hostile/proc/CanAttack() 2017-09-30 19:48:59 -05:00
AnturKandCitadelStationBot 6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
LetterJayandGitHub 04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJayandGitHub 4fd4d77eb1 Update shade.dm 2017-09-30 14:20:01 -05:00
LetterJayandGitHub d4cdba3297 Update parrot.dm 2017-09-30 14:18:02 -05:00
LetterJayandGitHub 063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -04:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04: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 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 eb05246c8b Update giant_spider.dm 2017-09-29 23:33:54 -05: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 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
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
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
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
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
CitadelStationBotandkevinz000 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
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
LetterJayandGitHub a8043202c2 Update golems.dm 2017-09-27 22:43:57 -05:00
LetterJayandGitHub 7a0ffb8a67 Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJayandGitHub 4f85246e42 Update robot_modules.dm 2017-09-27 18:42:06 -05:00
LetterJayandGitHub 35761abdc8 Update robot_modules.dm 2017-09-27 18:40:46 -05:00
LetterJayandGitHub 574ae23e51 Update robot_modules.dm 2017-09-27 17:58:32 -05:00
LetterJayandGitHub 6818a3f5c9 Update robot_modules.dm 2017-09-27 17:36:14 -05:00
ShizCalevandCitadelStationBot fa92394e4e DisplayTimeText for round time on login 2017-09-27 15:45:05 -05:00
LetterJayandGitHub 18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
ArmhulenandCitadelStationBot 0aea66649e whoops we'll get right on that (#31020) 2017-09-27 00:45:49 -05:00