dc9b438bd8
Update skeletons.dm
2017-10-03 18:47:01 -05:00
e4d6219f1d
Update brain_item.dm
2017-10-03 18:46:41 -05:00
fd5acc5573
Organ initialization cleanup
2017-10-03 14:18:39 -05:00
0888d3944e
Merge pull request #31210 from MoreRobustThanYou/patch-7
...
Silicons can no longer take brain damage
2017-10-03 06:20:51 -05:00
dffcebf4ff
[MIRROR] Remove ash drake hide from lesser ash drakes butcher loot ( #2938 )
...
* Merge pull request #30884 from Arianya/patch-1
Remove ash drake hide from lesser ash drakes butcher loot
* Remove ash drake hide from lesser ash drakes butcher loot
2017-10-02 23:20:55 -07:00
3e6ceaa9a2
Revert "Organize hair and facial hair in character creation" ( #3084 )
2017-10-02 23:16:51 -07:00
08b9a11536
Update retaliate.dm
2017-10-02 17:32:54 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
cc8f494f1f
Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129
...
[MIRROR] Cleans up some antag/event landmark checks
2017-10-01 23:36:48 -04:00
05022208e3
Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213
...
[MIRROR] Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 20:48:09 -04:00
64ced3f6f4
Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114
...
[MIRROR] Fixes space vision
2017-10-01 16:56:24 -04:00
e2dd424fb0
Revert "Prompt for observer confirmation now happens when you click it initially"
2017-10-01 15:50:27 -05:00
0480bebc8b
Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167
...
[MIRROR] Prompt for observer confirmation now happens when you click it initially
2017-10-01 16:38:27 -04:00
cef0d9ef68
Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165
...
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
2017-10-01 16:35:53 -04:00
3d2b5e99c9
Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143
...
[MIRROR] adds a space
2017-10-01 16:29:35 -04:00
e572d2e529
Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
...
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
d701230090
Merge pull request #31114 from AnturK/spacevision
...
Fixes space vision
2017-10-01 15:15:54 -05:00
21302e3fdc
Merge pull request #3032 from Citadel-Station-13/upstream-merge-31141
...
[MIRROR] Speeds up simple_animals/hostile/proc/CanAttack()
2017-10-01 15:49:44 -04:00
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
c56bb27bbd
Merge pull request #31167 from tgstation/Cyberboss-patch-2
...
Prompt for observer confirmation now happens when you click it initially
2017-10-01 14:43:52 -05:00
fafd98ed0e
Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142
...
[MIRROR] Fixes cogscarab sprites not updating
2017-10-01 15:42:35 -04:00
40f541b9da
Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
...
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
40bcb74a56
Fixes delete hotkey triggering messages when the user isn't even a living mob ( #31165 )
2017-10-01 09:25:27 -05:00
37942a2279
Update hostile.dm
2017-10-01 01:57:49 -05:00
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -04:00
ef96be641a
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
...
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -04:00
81e40cc5c8
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
...
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
747312cb6d
updates
2017-10-01 00:59:59 -05:00
318d28976f
Merge pull request #31143 from praisenarsie/patch-2
...
adds a space
2017-09-30 21:45:47 -05:00
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
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
e8a1ceffcb
Speeds up simple_animals/hostile/proc/CanAttack()
2017-09-30 19:48:59 -05:00
6411e25110
Fixes liches losing spells
2017-09-30 14:54:02 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
4fd4d77eb1
Update shade.dm
2017-09-30 14:20:01 -05:00
d4cdba3297
Update parrot.dm
2017-09-30 14:18:02 -05:00
063a44281e
Merge branch 'master' into upstream-merge-31044
2017-09-30 14:53:08 -04:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
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
d7db5f23cb
Update humanoid.dm
2017-09-30 02:13:33 -05:00
ee0c45751b
Update simple_animal.dm
2017-09-30 01:45:46 -05:00
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
8048ce1842
Update humanoid.dm
2017-09-30 01:37:32 -05:00
eb05246c8b
Update giant_spider.dm
2017-09-29 23:33:54 -05:00
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
ba189c041b
Fixes shade attackby
2017-09-29 04:30:50 -05:00
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
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