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
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
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
8707e37845
Fixes russian revolver being abusabled. You can no longer use it on someone other than yourself. Aiming somewhere other than head/eyes/mouth doesn't instakill but still deals damage. You need to spin the chamber after each shooting attempt. Only humans can use the gun.
...
Making a can_trigger_gun() proc that tests if the mob can trigger the gun.
2014-12-23 21:08:00 +01:00
paprka
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
Mandurrrh
0b16835c47
New Dresses and resprited Black Tango Dress
2014-12-22 18:23:11 -05:00
hornygranny
7f4dbcfa15
Merge pull request #6493 from MrPerson/feature_removal_2
...
Removes the heat up donk pocket recipe
2014-12-22 12:22:13 -08:00
MrPerson
4622ecf3d3
Removes the sugar from donk pockets
...
Further cleanup of them
2014-12-22 11:50:22 -08:00
tkdrg
359c5896ed
Merge remote-tracking branch 'upstream/master' into meido
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-22 16:19:43 -03:00
hornygranny
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
hornygranny
4acb27da43
Merge pull request #6500 from Menshin/guns_related_bugfixing
...
Guns related bugfixes
2014-12-22 10:46:30 -08:00
Menshin
de028f4997
Allows setting an associative variable to null.
2014-12-22 16:27:23 +01:00
paprka
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
MrPerson
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
Menshin
da55be55b3
Made the preloader independant of the called New().
...
That fixes any runtime with a positional argument being erased by the maploader.
2014-12-22 01:24:31 +01:00
Menshin
4a142a0a6b
* Motions alarms will now properly clear for AI (and silicons)
...
* Some code cleaning
2014-12-21 13:29:51 +01:00
Menshin
20c640ae38
Added some defines for better clarity
2014-12-21 02:10:01 +01:00
Menshin
05378c014d
* fixes #3765 (shotguns sawing off)
...
* fixes #994 (clumsy guns firing)
* fixes #6443 (laser tags firing without vest on)
* fixes #6262 (optimizing revolver reloading)
2014-12-21 01:35:49 +01:00
MrPerson
74e8598fe0
Removes the heat up donk pocket recipe
...
I could cap tricord in the new pocket but frankly this recipe is dumb anyway
Fixes #6437
Also stops the duplication of donk pockets, which is a shame but oh well.
2014-12-20 06:39:06 -08:00
hornygranny
579f297076
Merge pull request #6444 from tkdrg/shardopplsnerf
...
Tweaks the Supermatter a bit
2014-12-19 14:57:22 -08:00
tkdrg
d7e05d4387
Adds Supermatter logging and tweaks the power gen
...
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
2014-12-19 18:19:48 -03:00
hornygranny
166778d43e
Merge pull request #6459 from MrPerson/ninja_rewrite
...
Removes a bunch of commented out code from ninja.dm
2014-12-19 10:48:51 -08:00
hornygranny
0600ad6948
Merge pull request #6462 from phil235/BearTrapRemovalFailMsg
...
Fixes handcuff/legcuff/beartrap removal fail message
2014-12-19 10:47:41 -08:00
paprka
f1963ce537
Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
...
Conflicts:
code/modules/clothing/head/soft_caps.dm
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
tkdrg
f1101f77a9
Adds 3 more scarves
...
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
2014-12-19 00:24:01 -03:00
Cheridan
fdab1d7294
REMOVES THE BLACKS
2014-12-18 21:16:29 -06:00
Cheridan
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
tkdrg
d44fa004b0
Merge branch 'master' into scarfs
...
Conflicts:
icons/obj/clothing/ties.dmi
2014-12-18 23:35:15 -03:00
tkdrg
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
tkdrg
d2c85dc9c4
Merge branch 'master' into meido
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2014-12-18 17:47:55 -03:00
Hornygranny
cd22bfc11f
refactors narsie to use the object oriented programming meme
2014-12-18 11:44:20 -08:00
phil235
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
MrPerson
81591498ca
Removes a bunch of commented out code from ninja.dm
2014-12-18 07:29:16 -08:00
Cheridan
566066a73a
Merge pull request #6441 from paprka/corpsecthecorpening
...
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
paprka
adc09ffe41
initial commit for bay ports
2014-12-17 23:42:09 -08:00
paprka
9d46ccceac
old warden jacket for the lockers
2014-12-17 23:01:10 -08:00
paprka
0976cde773
updates ian so he can use civillian armor instead of sec armor
2014-12-17 18:13:24 -08:00
tkdrg
62b99c7007
Adds scarfs
...
These come in red and green, and can be equipped in the tie slot.
They are available from the ClothesMate vendomat. Sprites by Nienhaus.
2014-12-17 19:19:15 -03:00
Cheridan
62252f0273
Merge pull request #6420 from phil235/TypoFix2
...
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
tkdrg
c0fb78edd5
Tweaks the Supermatter a bit
...
Reduces the amount of heat and power released. Removes redundant code.
2014-12-17 16:06:33 -03:00
hornygranny
5a26db0285
Merge pull request #6401 from Menshin/solars_runtime_fix
...
Fixes controless solar tracker runtime
2014-12-17 11:04:29 -08:00
paprka
a6e12c2ea9
warden bug, warden belt, backpacks
2014-12-17 09:19:04 -08:00
