ec3d8164a8
Now uses isturf
2014-07-03 20:30:29 +04:00
09f2699f42
Two fixes
...
Double click made non-snowflake, cancel camera exploit patched
2014-07-03 19:33:46 +04:00
d8ae776f64
Gives the AI a hud
2014-07-03 18:52:11 +04:00
a8b7588c12
Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
...
Conflicts:
code/game/objects/items/weapons/grenades/ghettobomb.dm
code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
943f861532
Merge pull request #3918 from phil235/MobAttackFix3
...
Fix for various mob attack message (take two)
2014-06-16 10:38:57 +01:00
02d4a5a0d2
Merge pull request #3904 from Cheridan/sillynarnar
...
Nar-Sie update
2014-06-16 10:37:35 +01:00
46a60140c3
Resisting out of handcuffs should not update your icon properly
...
The icon was being updated before the cuffs were removed
2014-06-14 19:34:18 -06:00
514ed5f0af
Merge pull request #3805 from Menshin/hud_and_pulling
...
Non-human HUD polishing (stop pulling and intent buttons)
2014-06-13 17:58:49 -05:00
04d3717193
attack message Human
2014-06-13 20:12:16 +02:00
10ef6bf1b1
attack message alien humanoid
2014-06-13 20:08:27 +02:00
d825ae0f92
attack message alien larva
2014-06-13 20:07:28 +02:00
19a9bab445
attack message slime
2014-06-13 20:06:03 +02:00
6817e93aeb
attack message monkey
2014-06-13 20:05:05 +02:00
1152a5b099
attack message simple animals
2014-06-13 20:03:59 +02:00
df285ff7b3
Resolved conflicts:
...
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
79a08d5efd
Merge pull request #3898 from Ikarrus/striptextfix
...
Stripping people now bolds the text for the target
2014-06-13 09:14:01 +01:00
13f53bdb81
Merge pull request #3842 from Cheridan/stopbeatingpeople
...
'Released' Sechud Icon Edit
2014-06-12 10:41:28 +01:00
8d4e73a493
Merge pull request #3885 from Giacom/gravity_bounce
...
Zero gravity bouncing.
2014-06-11 20:33:52 -05:00
b80e9eda57
Nar-Sie update
2014-06-11 14:19:58 -05:00
96bc65d620
Stripping people now bolds the text for the target
...
Quick fix for #3896
2014-06-11 09:11:34 -06:00
a4cedc741e
Merge pull request #3848 from Rockdtben/roboticHealRefactor
...
Moved item_heal_robotic out of obj/item and into mob_helpers.dm
2014-06-11 11:39:20 +01:00
3908160998
One big update for stacks.
2014-06-10 20:36:08 +04:00
29386858c7
Merge pull request #3878 from Ikarrus/stripfix
...
Fixes stripping stunned/dead people
2014-06-10 09:35:21 -05:00
6f61d000b0
Finalized gravity bouncing.
2014-06-09 21:09:16 +01:00
f4b0a48253
Merge branch 'master' of https://github.com/tgstation/-tg-station into gravity_bounce
...
Conflicts:
code/modules/mob/living/living.dm
code/modules/mob/mob_movement.dm
code/modules/power/gravitygenerator.dm
2014-06-09 20:26:17 +01:00
13f097ca9a
Merge pull request #3853 from phil235/AlienCuffBreakFix2
...
Alien roars instead of screaming when breaking cuffs.
2014-06-09 14:20:08 -05:00
b827a3b5f2
Merge pull request #3862 from Kelenius/OfSlimesAndCommands
...
Of slimes and commands
2014-06-09 12:39:52 -05:00
df7b758d34
Fixes stripping stunned/dead people
...
Fixes #3877
2014-06-09 08:51:38 -06:00
fe26d167f7
Merge pull request #3847 from Rockdtben/RefactorSoulstone
...
Moved these 2 procs out of obj/items/ and to obj/items/devices/soulstone
2014-06-07 15:34:52 -05:00
9e78e71537
Right
2014-06-07 13:37:36 +04:00
ed42dd2d58
Merge pull request #8 from tgstation/master
...
update repo
2014-06-06 20:16:35 +02:00
1dfaa6711a
overriding cuff_break proc
2014-06-06 20:10:35 +02:00
f9c2b9d6d8
Aliens stop screaming like hulk when breaking handcuffs
2014-06-06 20:10:26 +02:00
c4aebda258
Merge pull request #3421 from GunHog/AI_Lockdown
...
Gives Malfuncting AIs the Hostile Lockdown ability!
2014-06-06 12:17:53 -05:00
9b083e95ac
Merge pull request #3841 from ike709/2014-06-04-#3788-Fix
...
Fixes #3788 Animals retaliating after death
2014-06-06 09:17:36 +01:00
a6aca7617f
Removed useless changes from first commit.
2014-06-05 20:33:07 -05:00
8708a65016
None of the animals should retaliate while dead.
2014-06-05 20:19:19 -05:00
569d12facf
Moved item_heal_robotic out of obj/item and into mob_helpers.dm
2014-06-05 19:25:08 -05:00
1725d633fb
Moved these two procs out of obj/items/ and to obj/items/devices/soulstone
...
transfer_soul(var/choice as text, var/target, var/mob/U as mob).
init_shade(var/obj/item/device/soulstone/C, var/mob/living/carbon/human/T, var/mob/U as mob, var/vic = 0)
Fix some poor formatting in soulstone.dm
2014-06-05 18:34:06 -05:00
6a7a9f8a78
'Released' Icon Edit
...
Released -> Discharged
2014-06-04 18:48:13 -05:00
85de677d1b
Fixed issue #3788 . Message "[src] gets an evil-looking gleam in \his eye" no longer displays when Pete is dead.
2014-06-04 01:12:29 -05:00
40800b79e0
The Loggening: Admin Edition
...
-Build mode logging. A lot of its functions are highly abusable but not logged
-Gravity Catapults no longer spam asay. They will be kept in the game log.
-Logging for Cyborg handcuffs
-Logging for Stripping/equipping
-Logging for decreasing PA power control. Easier as an admin to tell when I should panic without having to watch them like a hawk.
-Logging for disposaling people
-Some code optimizations along the way as well
2014-06-02 23:13:33 -06:00
8e94bff33c
-Giacom's Feeback
...
-Belt, ID, and Pockets are no longer blocked by exosuits, as they are still visible
2014-06-02 21:07:21 -06:00
ce35503695
Greyed out empty slots for easier readability
2014-06-01 22:45:28 -06:00
8cd20b3e77
Added checks in Topic()
2014-06-01 21:12:06 -06:00
5a7db48f96
Improved readability of the strip panel with <BR>s
2014-05-31 14:26:48 -06:00
e47b75c02f
Strip Menu now obscures items based on flags_inv
...
I also made it look pretty
2014-05-31 13:45:14 -06:00
47eeeefe31
Merge pull request #3731 from Ikarrus/internalshelp
...
You can now set internals on someone else's belt and suit storage
2014-05-31 11:43:47 -05:00
8beda90c81
* Added a "stop pulling" button to monkeys and alien larva
...
* Make aliens use their hud "intent button".
* Make monkeys use the current selected (e.g midnight) hud "intent button".
2014-05-28 16:28:53 +02:00
26813fc6ac
What is this it shouldn't be here.
...
It's gone now
2014-05-25 11:15:41 -06:00
Kelenius
Alex
ikarrus
Cheridan
phil235
ike709
Rockdtben
ike709
Menshin