Commit Graph

9021 Commits

Author SHA1 Message Date
LetterJay 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
LetterJay b728fd6160 Update global_lists.dm 2017-09-30 01:38:27 -05:00
LetterJay 8048ce1842 Update humanoid.dm 2017-09-30 01:37:32 -05:00
ShizCalev 7e2873cd46 Corrected shuttle refuel time 2017-09-30 00:59:00 -05:00
LetterJay 7b3f91131b Update datum_traitor.dm 2017-09-29 23:45:07 -05:00
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 be08e0c29f Update mirror.dm 2017-09-29 23:42:12 -05:00
LetterJay 7df3c80a39 Update cloning.dm 2017-09-29 23:41:44 -05:00
LetterJay e515151610 Update h_sandbox.dm 2017-09-29 23:39:34 -05:00
LetterJay 9d40ab978a Update names.dm 2017-09-29 23:38:41 -05:00
LetterJay 70d75ffa98 Update global_lists.dm 2017-09-29 23:36:09 -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 fdef700001 Fixes AI law weights infinite loop 2017-09-29 17:31:17 -05:00
Jordan Brown cd334646c3 Fixes PA Href Issue 2017-09-29 17:23:59 -05:00
deathride58 6b81ecbeb0 time for 150 hours of testing 2017-09-29 17:46:59 -04:00
deathride58 808b0b6d9a guess whos bad at coding 2017-09-29 17:02:19 -04: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
ShizCalev 114009d972 Cleans up some unused code 2017-09-29 15:59:12 -05:00
Jordan Brown da29f2c8d4 Fixes subsystems not returning a qdel hint 2017-09-29 15:59:04 -05:00
oranges a4992bae90 Log attempted injections as well as successful ones 2017-09-29 15:57:50 -05:00
deathride58 f2f5c6d53e completely reworks how objectives are selected, reduces copypasta 2017-09-29 16:55:38 -04:00
LetterJay e8f581bb56 Merge branch 'master' into upstream-merge-31077 2017-09-29 12:46:25 -04:00
LetterJay 2858c53788 Merge pull request #2958 from Michiyamenotehifunana/wave3guns
Wave 3 of guns
2017-09-29 12:45:52 -04:00
LetterJay a12df2019f Merge pull request #2966 from Citadel-Station-13/upstream-merge-31024
[MIRROR] Air tanks get their own sprite, plus reset fix.
2017-09-29 12:19:27 -04:00
LetterJay 7f2d8bdaff Update Malf_Modules.dm 2017-09-29 11:18:58 -05: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 c80237c969 Update tank_types.dm 2017-09-29 00:48:53 -05:00
LetterJay 2d1d0b7fd8 Update tank_types.dm 2017-09-29 00:48:01 -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 8762540452 Merge pull request #2999 from Citadel-Station-13/upstream-merge-31072
[MIRROR] Add a fingerprint to pipes when interacted with by a wrench
2017-09-29 01:46:14 -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 8f6b143161 Merge pull request #2995 from Citadel-Station-13/upstream-merge-31076
[MIRROR] Fix dangling #elseif in list helpers
2017-09-29 01:45:25 -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 781b0359ae Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714
[MIRROR] Shooting walls can create bullet holes/dents
2017-09-29 01:44:54 -04:00
LetterJay d6a89948a2 Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078
[MIRROR] Cleanup operative landmarks
2017-09-29 01:44:17 -04:00
LetterJay 1715845fe1 Merge pull request #2990 from Citadel-Station-13/upstream-merge-31081
[MIRROR] You can now light cigars on burning people
2017-09-29 01:43:59 -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 3c608b3ad4 Merge pull request #2986 from Citadel-Station-13/upstream-merge-31079
[MIRROR] Remove unused ninja team var
2017-09-29 01:42:31 -04:00
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