Fox McCloud
57e5230add
Merge pull request #2233 from Markolie/ShitStar
...
AStar/Datastructures update
2015-10-03 19:20:46 -04:00
Markolie
6830928837
Bypass thick protection for syndicate borg hydro
2015-10-03 01:12:09 +02: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
0ffc27eded
Fix borer surgery
2015-10-02 05:54:33 +02:00
Markolie
4b8a5e226a
Fix docility not updating when host is unconscious
2015-10-02 05:24:03 +02:00
Markolie
e27f84df7d
Dead people can emote!
2015-10-02 03:59:03 +02:00
Markolie
7197a893e6
Switch AI announcement back to text input
2015-10-02 01:59:53 +02:00
Fox McCloud
5fe12d313a
Merge pull request #2260 from Markolie/fixesfixesfixesfixesfixesfixes
...
Fixes
2015-10-01 19:43:05 -04:00
Markolie
f052512578
Fixes
2015-10-02 01:34:37 +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
Fox McCloud
fc5641d926
Merge pull request #2253 from Markolie/darkness
...
Make darkness clickable
2015-10-01 17:11:31 -04:00
Markolie
e9188f7f38
AStar update
2015-10-01 20:18:05 +02:00
Markolie
4b5664b2a8
Remove reagent containers from syndiborgs
2015-10-01 04:38:19 +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
d18b18b5b4
Syndicate borg update, add medical syndicate borg, energy sword refactor
2015-10-01 04:21:24 +02:00
Mark van Alphen
cf9a35479c
Merge pull request #2220 from tigercat2000/more_ai_stuff
...
Add a few variables to the AI announcment message
2015-10-01 01:41:32 +02:00
TheDZD
d9f3cae655
Merge pull request #2231 from Markolie/hotkeys2
...
Hotkey/interface update
2015-09-30 19:40:49 -04:00
TheDZD
9b7b1c1913
Merge pull request #2217 from Markolie/s2
...
Add AI text announcements
2015-09-30 19:40:43 -04:00
Markolie
9ec1f3987c
Make darkness clickable
2015-10-01 01:35:59 +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
Mark van Alphen
7565da30ec
Merge pull request #2216 from Aurorablade/YETMOREBLOOD
...
In whitch the Slaughter demon gets changed
2015-09-30 20:40:48 +02: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
Markolie
7b97739a49
Remove duplicate procs, fix examine text
2015-09-30 15:34:17 +02:00
Fox McCloud
f000c0c225
Merge pull request #2238 from Markolie/emotes
...
Add cooldown to chirp emote, dsay fix
2015-09-29 22:37:31 -04:00
Mark van Alphen
f10fd6e1ee
Merge pull request #2212 from Spacemanspark/master
...
Makes *deathgasp less snowflakey
2015-09-30 04:30:53 +02:00
Markolie
9277a2f55e
Dsay fix
2015-09-30 03:35:30 +02:00
Markolie
8d99c8c689
Add cooldown to chirp emote
2015-09-30 03:04:15 +02:00
Aurorablade
fad133c70c
trying this whole force move dealy...
2015-09-29 19:37:57 -04:00
Markolie
3c0931ba7d
Better hotkey mode handling
2015-09-30 01:34:51 +02:00
Markolie
85009d81d8
Sanity checks
2015-09-30 01:26:22 +02:00
Markolie
8ad7eb56c2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into hotkeys2
...
Conflicts:
config/example/config.txt
2015-09-30 01:04:45 +02:00
Markolie
2f9fd64a55
Hotkey/interface update
2015-09-30 01:02:58 +02: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
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
Tigercat2000
b09c4f7b85
Add a few variables to the AI announcment message
...
Variables added:
- $species : Species name of the individual.
- $age : Character age
- $gender : Character gender, limited to female/male, sorry tumblr
2015-09-29 10:15:41 -07:00
Markolie
a810a37cdd
Announcement update
2015-09-29 19:00:20 +02:00
Markolie
a135e67f71
Add AI text announcements
2015-09-29 06:59:27 +02:00
DZD
b990b6c71b
Merge remote-tracking branch 'upstream/master' into vision
2015-09-28 19:03:14 -04:00
Spacemanspark
34b1a3a52f
Adds the death message to monkeys again. Oops.
2015-09-28 17:40:24 -05:00
Spacemanspark
197f0b7219
makes *deathgasp less snowflakey
2015-09-28 16:58:28 -05:00
Spacemanspark
624b7cbc71
Gives IPC's a unique death message in a less snowflakey manner.
2015-09-28 16:57:16 -05:00
Spacemanspark
a02d843153
De-snowflakes *deathgasp
2015-09-28 16:55:04 -05: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
2c7d6f1a1b
Law manager now only requires the host to be conscious
2015-09-28 18:25:50 +02:00
Fox-McCloud
6a2c7a82ff
Merge pull request #2194 from tigercat2000/frunkenstien
...
Frankenstein
2015-09-28 02:58:44 -04:00
Aurorablade
4e64deb560
Revert "Revert "Nomnomnomnom""
...
This reverts commit 0239b80e27
2015-09-27 22:41:44 -04:00
