Cheridan
ba20b8a265
Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
...
Resolves #1358 , /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
Firecage
e80e08d552
Allows you to pick up stuff with the verb while buckled.
2015-05-05 15:54:49 +02:00
Jordie0608
e810855367
reorganizing stray objs in /defines
2015-05-05 21:18:21 +10:00
Jordie
3606662c88
Merge pull request #9106 from phil235/BundleFix5
...
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Jordie
4da4d09ffb
Merge pull request #9190 from phil235/XenoManipFix
...
Xenomorphs with has_fine_manipulation can now pick up even big items
2015-04-28 23:48:46 +10:00
phil235
de7724f8d4
Xenomorphs with has_fine_manipulation (admin var edit only) can now pick up even big items of w_class 4 and 5.
2015-04-26 21:59:12 +02:00
GunHog
3ed9dc50bc
Acid_Act() fix
...
acid_act() now respects the unacidable flag for items exposed to acid,
but are not worn on a mob.
2015-04-26 02:29:04 -05:00
phil235
9132838420
Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
...
Conflicts:
code/game/machinery/computer/ai_core.dm
code/game/objects/items.dm
code/game/objects/items/robot/robot_parts.dm
code/modules/mob/living/carbon/brain/MMI.dm
2015-04-25 19:52:14 +02:00
kingofkosmos
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
phil235
d6cc2c07c6
Fix mmi deafened indefinitely. 9078
...
Fix carp knocking borg. 7394
Replace carp knockdown by stamina dmg (for human only) (now 5 bites instead of 7 to go from 100% to crit w/o armor) 7905
Fix being stunned as a borg causing temporary blindness, deafness and muteness. 9061
Change robot out of power: now only stunned, can talk but not move or interact. Adding feedback in examine. 6170
Robots now take damage in the hottest of inferno (35,000+ K) 8840
Nerfs uranium wall radiation: 6 times less radiation (just double the effect of urafloor), chain reaction range down to 1. 6841
Fixes putting braindead/notincorpse/ghosted brains in mmi, and same for mmi in borgs, the action fails and sends a message to the ghost. 4841 7447
Fixes brains taking eye damage and becoming blind. 6039
2015-04-21 23:35:12 +02:00
Jordie
e6143f6493
Merge pull request #8810 from AnturK/everybodywaskungfufighting
...
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
AnturK
e2c869bc77
- Adds generic action and action buttons system
2015-04-11 17:06:43 +02:00
AnturK
260d205598
- Adds Martial Art datum and Three styles
2015-04-11 16:32:20 +02:00
phil235
1b3eb49a1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
phil235
92b0f9f4cd
Adding a changelog.
...
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
Jordie
9a217503aa
Merge pull request #8451 from Fayrik/FoamForceFuckYeah
...
Foam force fuck yeah!
2015-03-25 16:30:42 +11:00
phil235
ffd711c26f
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/slime/say.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Fayrik
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
phil235
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Miauw
1873143e63
Initial say cleanup commit.
2015-03-18 19:23:31 +01:00
phil235
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
Cheridan
52dfa42eb5
Merge pull request #8257 from phil235/ReflectFix
...
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Cheridan
72f465c864
Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
...
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
phil235
4071f25270
Simplifies laser reflection code, no more reflect_chance var at the obj/item level.
2015-03-09 12:28:35 +01:00
Remie Richards
2d70141cd8
Allows admins (or coders if worn icons go the way of inhands) to specify an alternate file to load worn states from.
2015-03-03 20:23:26 +00:00
Remie Richards
1e8324c3c5
Exposes all embedding related multipliers as variables and definitions. Only items of throw_speed 4 or more can embed now, Explosions force their object to be thrown at 4, this throw_speed threshold is ON TOP of needing to be a can_embed() object.
2015-02-26 17:04:00 +00:00
Remie Richards
b1ff6b7220
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
...
Conflicts:
code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
Remie Richards
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Remie Richards
d519de5018
Added embedded items to self examining. Allows embedded items to be removed from yourself via links in self examining, this hurts. Adds can_embed(). Reworks help_shake_act().
2015-02-14 01:31:40 +00:00
Remie Richards
ab754b6182
Corrects all spellings of Embedds --> Embeds
2015-02-13 13:15:20 +00:00
Remie Richards
34ced43f45
Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars!
2015-02-13 12:59:02 +00:00
paprka
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
paprka
2706be1190
optimizations to the way inhand files are found
2015-01-18 21:14:47 -08:00
paprka
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
paprka
071c02b583
removes an unused var
2015-01-08 16:58:33 -08:00
hornygranny
56bad0f7ce
Merge pull request #6747 from paprka/gunchangesv2baby
...
Further changes to the ranged stun system
2015-01-08 16:09:37 -08:00
Boggart
e0a968f151
Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it.
2015-01-07 01:09:58 -07:00
paprka
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
Razharas
418e3a0613
General cleanup
...
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
Razharas
1b45752b05
Fixed conflicts
...
Ye again and again and again and again
Do it again, do it again~
2014-12-23 05:39:39 +03:00
MrPerson
2b763f18c1
Always reset the layer of things removed from storage
...
Fixes #6470
2014-12-19 09:42:06 -08:00
Razharas
0921aa201f
Added datum mutations
...
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Swag McYolosteinen
b828448645
Merge pull request #6228 from paprka/coatscoats
...
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
Razharas
7758a0afed
Ok now explosions shall work properly
...
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
Razharas
6ce052f45a
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExActFix
2014-12-05 20:45:27 +03:00
paprka
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
Cheridan
f909d59d1a
Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
...
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
hornygranny
bc9d9f6d58
Merge pull request #6105 from RemieRichards/AcidProtectionUpdate
...
Acid protection update
2014-12-03 10:28:47 -08:00
Razharas
f4f3768d70
Fixes ex_act() destroying too much shit
...
Borg modules are safe
So are items with bomb protection
Items in people who wear bomb-protective gear are safe too
2014-12-02 18:30:56 +03:00
Remie Richards
22cdf41891
Items worn INSIDE armour only melt when that armour is melted, Backpacks, Belts and handheld items are all worn externally so melt regardless of armour
...
Also updates pixel_x and pixel_y randomisation of grey goo.
2014-11-27 17:16:58 +00:00
