76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
208b59c30e
Fixed stuff tkdrg pointed out
...
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
60fc73d018
Merge pull request #6587 from phil235/MonkeyBiteMaskFix
...
Fixes being able to bite as a monkey with your mouth covered by a mask.
2014-12-28 01:01:14 -03:00
1846489593
Merge pull request #6589 from phil235/SiliconPunchMsgFix
...
Fixes message typos
2014-12-27 11:48:54 -03:00
7ee2317ec3
Merge pull request #6207 from phil235/RecursiveHearVisibleMessage
...
Mob inside something can now see visible_message()'s
2014-12-27 13:20:50 +01:00
cededeaa8e
Merge pull request #6498 from as334/MobReactions
...
Allows chemical reactions inside mobs
2014-12-27 01:20:18 -06:00
fc7c7b520d
Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
...
Blood-red hardsuit usability feature and syndicate loadout adjustments
2014-12-27 02:59:24 -03:00
82588d43bf
Merge pull request #6347 from Xhuis/bzzzt
...
Shocking animations
2014-12-27 05:23:09 +00:00
9ba34b32e6
Fixes return() borking the code
2014-12-27 00:17:57 -05:00
8acded6304
Merge pull request #6278 from Ergovisavi/muh_mobs
...
Mob faction cleanup / Some goliath changes / Hopefully fixing some lag
2014-12-26 23:23:48 -03:00
f07b250dde
Removes old comments and does damage immediately
2014-12-26 21:08:43 -05:00
188b85ae48
Merge pull request #5641 from MrPerson/autoghosting
...
Moving while dead causes you to ghost
2014-12-26 21:35:58 -03:00
615f3f3488
Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd
...
Conflicts:
code/modules/mob/living/damage_procs.dm
code/modules/projectiles/projectile.dm
2014-12-26 16:14:19 -08:00
84649dacd4
Merge pull request #6339 from tkdrg/rip'd
...
Ports the rapid pipe dispenser (RPD) from /vg/
2014-12-26 23:58:17 +00:00
08d36580ba
Merge pull request #6561 from paprka/manifestfixes
...
Expands the new player options menu
2014-12-26 13:22:24 -06:00
5c8a8b5dca
Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08:00
8a56892892
Fixes message typos in silicon punch message, mecha construction description, message when taking blood sample.
2014-12-26 12:13:54 +01:00
7445f27348
Merge pull request #6546 from Menshin/ian_place_hat_fix
...
Fixes runtime when usrless placing an item on Ian's head
2014-12-25 21:26:55 -08:00
dbaa0ca291
Merge pull request #6542 from phil235/SoreThroatFix
...
Fixes getting sore throat messages while dead.
2014-12-25 21:26:38 -08:00
a94012b98a
Ports the rapid pipe dispenser (RPD) from /vg/
...
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.
Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03:00
5d2994eb35
Merge pull request #6526 from paprka/secondchef
...
Adds second chef position / Renames chef to cook
2014-12-25 15:30:00 -06:00
591b2f363b
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-25 13:12:46 -08:00
389da595b8
expands the setup options menu
2014-12-25 11:32:47 -08:00
d8b85dda0a
Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
...
refactors narsie
2014-12-24 19:48:24 -08:00
7842ff8803
adds advanced tasers as default
2014-12-24 19:41:40 -08:00
748926a196
Merge pull request #6436 from paprka/sayshit
...
Auto capitalization for most living mob messages
2014-12-24 19:31:32 -08:00
1d1baa96bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-24 18:56:26 -08:00
1e6869bb24
Fixes runtime when usrless placing an item on Ian's head
2014-12-24 18:35:00 +01:00
0862d24a7a
Fixes being able to bite as a monkey with your mouth covered by a mask. Gives a feedback message when unable to bite.
2014-12-24 17:47:23 +01:00
495604228c
Merge pull request #6455 from paprka/bayports
...
Ports manifest / better ready button(s)
2014-12-24 11:54:40 +01:00
690efef0af
Fixes getting sore throat messages while dead.
2014-12-24 02:28:19 +01:00
a9d7266ca2
Merge branch 'master' of https://github.com/tgstation/-tg-station into muh_mobs
2014-12-22 19:55:04 -08:00
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
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
a89711b6e4
Reverting back to using the recursive get_hearers_in_view proc.
2014-12-22 22:37:16 +01:00
28a23f7dae
Merge pull request #6506 from Menshin/silicons_motion_alarms_fix
...
Fixes AI motion alarms not properly clearing
2014-12-22 10:47:18 -08:00
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
4a142a0a6b
* Motions alarms will now properly clear for AI (and silicons)
...
* Some code cleaning
2014-12-21 13:29:51 +01:00
57b41dce0d
Fixed some shiet
...
Redone how injectors handle mutations(now it doesnt copy the SE but
manipulates mutations directly)
Removed sole leftovers
Fixed humanizing
Fixed grammer
2014-12-21 08:19:23 +03:00
9a27fe7c8d
Conflict fix
...
Yeah makes it all work
2014-12-21 06:12:33 +03:00
aef4ebc006
Allows chemical reactions inside mobs
2014-12-20 19:27:43 -05:00
2481bef95f
Changed the visible_message procs and audible_message procs, they now use the new get_player_mob_hearers_in_view() proc instead of a recursive proc.
...
I removed some duplicated code from tools/tools.dm
Fixed two typos with span class.
2014-12-20 17:29:23 +01:00
0600ad6948
Merge pull request #6462 from phil235/BearTrapRemovalFailMsg
...
Fixes handcuff/legcuff/beartrap removal fail message
2014-12-19 10:47:41 -08:00
c667feeb61
Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage
...
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2014-12-19 15:23:16 +01:00
25cc2999b0
Refactors snowflake AI hosting in ninja
...
why did i volunteer for this
It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.
the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06:00
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
eaec9a6e1b
9 more scarves and small corgi cleanup
...
Adds 9 more scarves (light blue, dark blue, orange, yellow, purple,
white, black, zebra and christmas).
Cleaned up corgi code a little bit, specially the parts involving icon
updates. Fixes a bug where adding a hat to a dead corgi didn't make you
drop your hat and created duplicate items. Makes corgis only use one
head/back mob sprite and rotate it appropriately. Call
regenerate_icons() only when needed now, instead of doing so every tick
on Life().
2014-12-18 23:09:49 -03:00
cd22bfc11f
refactors narsie to use the object oriented programming meme
2014-12-18 11:44:20 -08:00
ca3df3b4a1
Fixes handcuff/legcuff/beartrap removal fail message appearing many seconds after the actual fail. It will now appear twice as fast.
...
Replacing two usr.
Fixing being able to remove both handcuff and legcuff by resisting once.
2014-12-18 17:42:42 +01:00
Razharas
tkdrg
Swag McYolosteinen
Cheridan
Remie Richards
Xhuis
paprka
phil235
hornygranny
MrPerson
Menshin
Ergovisavi
as334
Cheridan