Fox-McCloud
6d978232d5
Merge remote-tracking branch 'upstream/master' into stupid-triggers
2015-10-06 18:25:26 -04:00
Fox McCloud
559b03bfeb
Merge pull request #2297 from Markolie/itemcolor
...
Replace _color with item_color
2015-10-06 16:11:35 -04:00
Tigercat2000
4fc91429e5
Baystation Rigsuits
...
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
2015-10-05 16:42:00 -07:00
Fox-McCloud
9c3e6f1ecd
Removes Update Triggers File
2015-10-05 16:14:38 -04:00
Fox McCloud
73b2fc122a
Merge pull request #2291 from Markolie/movefix
...
Fixes and pinpointer update
2015-10-05 16:01:02 -04:00
Markolie
93330288c8
Color updates
2015-10-05 20:13:49 +02:00
Markolie
bff7a9a80c
Replace _color with item_color
2015-10-05 19:55:14 +02:00
Markolie
f9adb09c72
Drone message fix, let robots unbuckle
2015-10-05 19:37:35 +02:00
Markolie
fdc3578582
Turn poll magic strings into defines
2015-10-05 19:25:05 +02:00
Tigercat2000
8c97846746
-tg- style inventory update, stripping update
...
This commit does the following:
- Updates a few of our inventory procs to -tg-'s latest
- Nukes the equip_e system from orbit
- Fancy UI for stripping people now
- Nuked fucking kitten ears from their snowflakey bullshit update_icons
shitty fuck fuck FUCK
- NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
Markolie
b24f5ff979
Fixes and pinpointer update
2015-10-05 00:26:43 +02:00
Fox McCloud
909ce846d8
Merge pull request #2274 from Markolie/movefix
...
Ambulance/movement fixes
2015-10-04 02:10:56 -04:00
Mark van Alphen
25d06864e0
Merge pull request #2275 from Crazylemon64/no_giving_nodrops
...
Fixes putting NODROP items onto humans
2015-10-04 02:50:18 +02:00
Crazylemon
ede190fc6d
Does a small amount of further tweaking Topic()
...
Watches out for NODROP trickery here. Haven't found where looting for
aliums or robots resides, though.
2015-10-03 16:55:58 -07:00
Fox McCloud
57e5230add
Merge pull request #2233 from Markolie/ShitStar
...
AStar/Datastructures update
2015-10-03 19:20:46 -04:00
Crazylemon
df847a617f
Fixes putting NODROP items onto humans
...
Fixes #2270 , #2259
2015-10-03 12:55:38 -07:00
Markolie
52d4135648
Ambulance/movement fixes
2015-10-03 21:33:40 +02: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
