TheDZD
297cc55fa7
Merge pull request #2255 from Markolie/alarm
...
Add alarm sound to display case
2015-10-02 15:50:27 -04:00
TheDZD
8181354ffc
Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes
...
Fixes
2015-10-02 15:50:23 -04:00
TheDZD
de8e5ecfd0
Merge pull request #2254 from Markolie/swordnborg
...
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-02 15:49:57 -04:00
Mark van Alphen
5f2fb9a7a4
Merge pull request #2250 from tigercat2000/xenoputers
...
Remove remaining arbitrary restrictions
2015-10-02 19:30:40 +02:00
Markolie
e27f84df7d
Dead people can emote!
2015-10-02 03:59:03 +02:00
Fox McCloud
62d25caec7
Merge pull request #2252 from tigercat2000/atommovablebuckling
...
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
2015-10-01 19:01:39 -04:00
Mark van Alphen
b004303cf6
Merge pull request #2245 from Fox-McCloud/ZAS-Is-Dead
...
And So Dies ZAS
2015-10-01 19:27:22 +02:00
Markolie
66637854f1
Derp
2015-10-01 05:21:20 +02:00
Markolie
fae54dbd0d
Up the volume
2015-10-01 05:17:13 +02:00
Markolie
ca05be7536
Add alarm sound to display case
2015-10-01 05:16:26 +02:00
Markolie
f6903f0152
Alien specific 2
2015-10-01 04:33:58 +02:00
Markolie
d40cfe582e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg
...
Conflicts:
icons/obj/surgery.dmi
2015-10-01 04:32:10 +02:00
Markolie
bb0bbdcf5a
Alien claws fix
2015-10-01 04:27:59 +02:00
Markolie
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Tigercat2000
575362b0f4
Move buckling to /atom/movable, can now buckle to mobs if adminbooze
...
Also changed:
- Comment clarifying what buckle_lying = -1 means
- Changes direction of lying on operating tables, somehow missed it
2015-09-30 15:29:47 -07:00
Tigercat2000
d0af69afd5
Spanssss
2015-09-30 13:45:54 -07:00
Tigercat2000
c4fa813331
Remove remaining arbitrary restrictions on has_fine_manip
...
This commit removes all (most) of the remaining code limiting xenomorphs
that have has_fine_manipulation on an entirely arbitrary basis. Xenomorphs
with has_fine_manipulation may now interact with NanoUI, and will only
break computers on non-help intent. The can also tear down walls, since
walls used an ishuman check in place of an isAdvancedToolUser check as
they should have.
Minor refactor to machinery.dm as well; Instead of the slightly
(completely) insane attack_hand restriction to humans and silicons (it was
a multi-line IF, why), it now checks user.IsAdvancedToolUser(); This means
restrictions on monkies will actually function properly now.
2015-09-30 10:50:10 -07:00
Crazylemon
aaaaa14ae8
Fixes the misplaced quote
...
Does not fix: How tired I am
2015-09-30 08:05:34 -07:00
Crazylemon
d925ee8a10
Fixes the syntax errors and is more consistent with messages now
2015-09-30 07:59:29 -07:00
Crazylemon
6c5a643944
Fixes the roller_holder to work again
...
After the buckling rehaul, the roller holder couldn't unbuckle patients
nor collapse/collect beds. This should readd that functionality.
2015-09-30 01:42:35 -07:00
Fox-McCloud
3236fa8be5
And So Dies ZAS
2015-09-30 02:00:39 -04:00
Fox McCloud
15c9873cdf
Merge pull request #2224 from Markolie/shitcode
...
Strange reagent fix, tod --> timeofdeath
2015-09-29 18:25:04 -04:00
Markolie
8b2e62fc10
Strange reagent fix, tod --> timeofdeath
2015-09-29 22:03:04 +02:00
Mark van Alphen
603a77bc3d
Merge pull request #2218 from Fox-McCloud/safe-cleanup
...
Safe Cleanup and Fix
2015-09-29 21:55:07 +02:00
Crazylemon
734e0842e2
Fixed a few more reversed add_logs
...
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Mark van Alphen
25f19dff0d
Merge pull request #2204 from Fox-McCloud/belt-of-holding
...
Ports NT Station's Belt of Holding Sprite
2015-09-29 18:47:17 +02:00
Fox-McCloud
7586390436
Merge pull request #2146 from TheDZD/vision
...
Shadowling, Changeling, and Vision Fixes/Changes
2015-09-29 11:44:06 -04:00
Fox-McCloud
62fb3c2981
Safe Cleanup and Fix
2015-09-29 11:31:57 -04:00
TheDZD
6705006ee7
Merge pull request #2213 from Fox-McCloud/destroy-fixes
...
Fixes a few Destroys
2015-09-28 19:28:29 -04:00
TheDZD
19d8aa3d36
Merge pull request #2215 from Markolie/s2
...
Fix flamethrower logs
2015-09-28 19:03:45 -04:00
DZD
b990b6c71b
Merge remote-tracking branch 'upstream/master' into vision
2015-09-28 19:03:14 -04:00
Markolie
6825c33cb9
Fix flamethrower logs
2015-09-29 00:51:17 +02:00
Fox-McCloud
be672419ca
Fixes a few Destroys
2015-09-28 18:15:39 -04:00
Fox-McCloud
3ec20a2313
Merge pull request #2208 from Markolie/fixes3
...
Fixes
2015-09-28 16:32:11 -04:00
Tigercat2000
ec2b31e435
Nuke wheelchair snowflake shit, fix the delay
2015-09-28 12:59:44 -07:00
Markolie
2f148fd429
Cell update
2015-09-28 19:04:22 +02:00
Markolie
7678f601bc
Attack animation
2015-09-28 18:47:29 +02:00
Markolie
52b700f8c8
Proper sprite/sounds for electric arm
2015-09-28 18:45:57 +02:00
Markolie
699bbd0972
Compile
2015-09-28 07:46:30 +02:00
Markolie
3397ddf7c1
Fix inflatable walls
2015-09-28 07:41:24 +02:00
Fox-McCloud
444c616d5a
Ports NT Station's Belt of Holding Sprite
2015-09-27 23:43:41 -04:00
Markolie
dbbdf90670
Add missing c200 cash sprite
2015-09-28 05:03:19 +02:00
Markolie
f7fe8c8c6f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes3
...
Conflicts:
_maps/map_files/cyberiad/cyberiad.dmm
2015-09-28 03:05:04 +02:00
Mark van Alphen
48a3d1ab9a
Merge pull request #2176 from Fox-McCloud/janicarts-and-janitors
...
Janicart and Janitor Update
2015-09-28 03:02:04 +02:00
Fox-McCloud
d7f23f4271
Oh, that kind of list
2015-09-27 19:39:09 -04:00
Fox-McCloud
155afc6131
lists
2015-09-27 19:24:35 -04:00
Mark van Alphen
eb1739afd9
Merge pull request #2178 from tigercat2000/heart-tg-
...
Pixel-coords laserpointer
2015-09-28 00:24:41 +02:00
Markolie
b914544a87
Fixes
2015-09-27 22:50:09 +02:00
DZD
0ceaf664af
Fix merge conflicts
2015-09-27 11:24:51 -04:00
Fox-McCloud
569758f4cb
bluespace trashbag
2015-09-27 06:46:50 -04:00
