f88b6a6c4d
Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz
...
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
2014-07-07 10:25:45 +01:00
d497387355
Merge pull request #4048 from Kelenius/OfAIAndHUD
...
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
10c9d4d14e
Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm.
2014-07-06 02:33:13 +10:00
2c0ac7bfd8
Updoots
2014-07-05 15:56:29 +02:00
559d83c36e
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-04 16:56:33 +02:00
983ac3ed79
Killer Tomatoes
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-04 16:27:54 +02:00
7cd52c3b6f
Merge pull request #4046 from Aranclanos/breathruntime
...
Too hot or too cold? Fuck that, I'll runtime once per second. Per human.
2014-07-03 20:00:11 -05:00
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
61200625b5
Fixes the runtimes clogging the logs, handle_temperature() will now use the human on their params.
2014-07-03 03:11:06 -03:00
b02b93ce2a
Notifications + Random Stuff
...
Adds sound notifications for Ninja and Wizard Apprentice spawning -- hopefully means fewer afk antags.
Adds a ghostnotice span class, used in the new notify_ghosts proc. Upon creation, things that require ghostly attention (NarSie, golem runes) give more visible messages to the dead.
Retires the 'moderate' span class, which was only used in tomato throwing? Refactors tomato code (this ended up being the meat of this PR, somehow...)
Reorganizes some item definition/procs.
2014-07-01 23:16:02 -05:00
ce9773294d
Resolved Conflicts:
...
code/modules/mob/living/carbon/carbon.dm
2014-07-01 13:02:40 -06:00
c65aa2b5a4
Merge pull request #4000 from Cheridan/terribleidea
...
MONKEY MODE REDUX
2014-06-30 16:27:22 -03:00
134272b744
Merge pull request #3949 from Rolan7/MidJuneBugfixes
...
Changeling/say code bugfixes
2014-06-30 11:19:59 -05:00
69ba4e1612
Fixes compilation errors
2014-06-27 09:44:05 -06:00
d3ec4dbf72
Resolving Conflicts:
...
_maps/map_files/tgstation.2.1.3.dmm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/secbot.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-06-27 09:30:43 -06:00
6befeed46f
-Giacom's feedback
...
-Fixed secbots being able to stun silicons
-Added an attack cooldown for secbots
2014-06-27 09:25:52 -06:00
a04d5ffc9e
Merge pull request #3953 from Ikarrus/alienERPfix
...
Humanoid aliens can now strip again.
2014-06-26 09:26:37 +01:00
95d9829e62
Fixes #4002
...
Where is your god now
2014-06-23 21:53:14 -04:00
7decfe8621
Merge branch 'master' of https://github.com/tgstation/-tg-station into MidJuneBugfixes
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
2014-06-21 09:00:21 -04:00
4ca1c68bd9
Merge pull request #3958 from hornygranny/metaconfirmation
...
more obvious metaconfirmation from digital camo
2014-06-21 00:41:49 -05:00
f786a6c2c0
Merge pull request #3959 from CollenN/mutrace-final
...
Finalizes Mutantrace Datum Update
2014-06-20 21:47:54 -05:00
56eb50938b
Added some of Cheridan's suggestions
...
*Removed 'Make 2spooky' admin command
*You can still gib even if you don't have DNA
*species_types now uses absolute pathing (probably not gonna do the same
for species.dm, mainly because with such a large file it strikes me as
practical to keep the paths relative)
2014-06-20 21:35:48 -04:00
0a173f10dd
Aaaaaaaaaaaaaaarghhhhh
...
IN MY DEFENSE, you can't actually be set on fire in the first place if
you have HEATRES or NOFIRE in your specflags, so it was easy for me to
overlook this one.
This is really more of an issue with BYOND than anything else.
2014-06-20 17:19:00 -04:00
713ce934b4
t
2014-06-20 09:22:27 -07:00
2aab5fa71c
Finalizes Mutantrace Datum Update
...
https://github.com/tgstation/-tg-station/pull/3609
Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
913b3061a0
more obvious metaconfirmation from digital camo
2014-06-19 13:44:24 -07: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
ff1767a6a8
Update simple_animal.dm
2014-06-18 08:33:33 -06:00
38434271fc
Update metroid.dm
2014-06-18 08:33:17 -06:00
72eb5592cb
Update larva.dm
2014-06-18 08:32:49 -06:00
aabd426794
Humanoid aliens can now strip again.
...
Other restrictions are still in place.
Fixes #3952
2014-06-17 20:26:52 -06:00
98367cb162
Changelings can use hivechat while muzzled.
...
Monkey-lings can use hivechat.
Lings can return to human form even if monkeyed through genetics.
One-line fix for Destroying Angels (..() wasn't being called)
Spelling correction in Destroying Angel description
2014-06-17 00:13:56 -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
8b690f492d
-Securitrons will declare the threatlevel of the perp when making an arrest/detention
...
-emagging will turn declarations off
-People with criminal status "Incarcerated" or "Parolled" will increase threatlevel
2014-06-15 17:08:39 -06:00
7f1bea18e5
Securitron Update
...
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now
I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.
2014-06-15 16:19:32 -06:00
352d5a5627
MONKEY MODE REDUX
...
AHUAHEUAHUHEGUEHGAUHEGUAEH
monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
2014-06-14 21:30:25 -05: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
Alex
Ben G.
AstralSerpent
Firecage
Cheridan
Kelenius
Aranclanos
ikarrus
CollenN
Rolan7
Hornygranny
phil235