tkdrg
e00a1b0806
Merge pull request #6572 from paprka/fixescargo
...
Removes broken tactical helmets crate
2014-12-27 09:45:11 -03:00
Swag McYolosteinen
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
Cheridan
cededeaa8e
Merge pull request #6498 from as334/MobReactions
...
Allows chemical reactions inside mobs
2014-12-27 01:20:18 -06:00
as334
8a9d7b12c4
Change the spacing.-For Cheridan
2014-12-27 02:09:07 -05:00
as334
a3e70b3cf2
Prevents certain chemical reactions occuring in mobs.
2014-12-27 01:38:31 -05:00
paprka
87d0cbdb2b
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo
...
Conflicts:
code/modules/clothing/head/helmet.dm
2014-12-26 22:31:54 -08:00
paprka
5fb8ae35b4
removes tactical helmets
2014-12-26 22:30:24 -08:00
tkdrg
45904bb8a2
Merge pull request #6425 from JJRcop/OOCemoji
...
Adds emoji to OOC chat [Now with in-house sprites!]
2014-12-27 03:01:36 -03:00
tkdrg
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
Remie Richards
82588d43bf
Merge pull request #6347 from Xhuis/bzzzt
...
Shocking animations
2014-12-27 05:23:09 +00:00
Xhuis
9ba34b32e6
Fixes return() borking the code
2014-12-27 00:17:57 -05:00
paprka
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08:00
tkdrg
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
Xhuis
f07b250dde
Removes old comments and does damage immediately
2014-12-26 21:08:43 -05:00
Remie Richards
344142634e
Merge pull request #6518 from TZK13/Chocolate-Food
...
Adds three new food items made with chocolate bars
2014-12-27 00:55:42 +00:00
Remie Richards
17f1e7f044
Merge pull request #6516 from paprka/suitcensorsv2v2
...
Tweaks suit sensor menu to be easier to use
2014-12-27 00:37:47 +00:00
tkdrg
188b85ae48
Merge pull request #5641 from MrPerson/autoghosting
...
Moving while dead causes you to ghost
2014-12-26 21:35:58 -03:00
paprka
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
Remie Richards
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
Cheridan
efa27af9f4
Merge pull request #6567 from tkdrg/verboten
...
Reinstates bomb capping on Supermatter shard explosions
2014-12-26 16:30:21 -06:00
Cheridan
71385308de
Merge pull request #6387 from Incoming5643/goodbye_my_children
...
Magic Mania 1.8: Summon Spells Rework and The Challenge System
2014-12-26 16:29:36 -06:00
Cheridan
08d36580ba
Merge pull request #6561 from paprka/manifestfixes
...
Expands the new player options menu
2014-12-26 13:22:24 -06:00
paprka
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
Razharas
7eb69190e7
Merge pull request #6356 from paprka/burtsfiya
...
Burst fire for some projectile weapons
2014-12-26 08:38:21 +03:00
hornygranny
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
hornygranny
dbaa0ca291
Merge pull request #6542 from phil235/SoreThroatFix
...
Fixes getting sore throat messages while dead.
2014-12-25 21:26:38 -08:00
hornygranny
41bf34aee2
Merge pull request #6530 from paprka/consistentbs
...
Makes space suit/hardsuit suit storage consistent (oxy tanks)
2014-12-25 21:26:22 -08:00
tkdrg
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
tkdrg
adb8989327
Nerfs the supermatter explosion back to 3, 7, 14
...
Request by a headcoder and a server host.
2014-12-25 19:47:36 -03:00
Cheridan
068adcb4da
Merge pull request #6545 from tkdrg/runtimes-killed-santa
...
Fixes christmas event runtime
2014-12-25 16:20:45 -06:00
Cheridan
12ad2b796d
Merge pull request #6541 from phil235/GrenadeAssemblyConstructionFailMsgFix
...
Assembly holder no longer needs to be secured.
2014-12-25 16:16:00 -06:00
Cheridan
a75b1e1f22
Merge pull request #6340 from Menshin/fabricators_polishing
...
Autolathe revamp and sub-menus for fabricators
2014-12-25 16:11:54 -06:00
paprka
21df99154d
Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/obj/gun.dmi
2014-12-25 13:51:43 -08:00
Menshin
cf41dab26f
Conflict fixing
2014-12-25 22:34:40 +01:00
Cheridan
5d2994eb35
Merge pull request #6526 from paprka/secondchef
...
Adds second chef position / Renames chef to cook
2014-12-25 15:30:00 -06:00
paprka
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
paprka
389da595b8
expands the setup options menu
2014-12-25 11:32:47 -08:00
tkdrg
96237278fa
Merge branch 'master' into meido
...
Conflicts:
code/modules/clothing/under/miscellaneous.dm
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-25 12:41:29 -03:00
paprka
595ad8df58
fixed compile errors
2014-12-24 21:03:22 -08:00
MrPerson
d8b85dda0a
Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
...
refactors narsie
2014-12-24 19:48:24 -08:00
paprka
7842ff8803
adds advanced tasers as default
2014-12-24 19:41:40 -08:00
MrPerson
866668e639
Merge pull request #6513 from Menshin/maploader_instanciation_fixing
...
Maploader instanciation fix
2014-12-24 19:39:02 -08:00
MrPerson
748926a196
Merge pull request #6436 from paprka/sayshit
...
Auto capitalization for most living mob messages
2014-12-24 19:31:32 -08:00
paprka
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
hornygranny
1ff75b2f47
Merge pull request #6538 from phil235/RussianRevolverFix
...
Fixes russian revolver being abusable.
2014-12-24 13:30:31 -08:00
Menshin
1e6869bb24
Fixes runtime when usrless placing an item on Ian's head
2014-12-24 18:35:00 +01:00
tkdrg
26105e7ee1
Fixes christmas event runtime
2014-12-24 13:21:58 -03:00
Swag McYolosteinen
495604228c
Merge pull request #6455 from paprka/bayports
...
Ports manifest / better ready button(s)
2014-12-24 11:54:40 +01:00
phil235
690efef0af
Fixes getting sore throat messages while dead.
2014-12-24 02:28:19 +01:00
phil235
8ab92e753a
Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.
...
Adding feedback message when trying to attach two assemblies that aren't both in attach mode.
Fix hacky code to prime grenade by pulsing its assembly.
Removing some commented code and some duplicated proc instances.
Fixing a typo.
2014-12-24 01:50:19 +01:00
