2e4a8fcce8
Recieve --> receive grammarfix
...
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.
Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
55b81363cc
Merge remote-tracking branch 'upstream/master' into hardjet
...
Conflicts:
code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
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
edccabb0c4
Only engineering type hardsuits have the inbuilt jetpack.
2015-03-18 17:48:45 +00:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
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
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
d1f347f584
Fixes conflicts
...
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
2607a456c0
Merge pull request #6634 from paprka/chefuniform
...
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
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
cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03: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
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01: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
d8b85dda0a
Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
...
refactors narsie
2014-12-24 19:48:24 -08:00
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
de028f4997
Allows setting an associative variable to null.
2014-12-22 16:27:23 +01:00
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
cd22bfc11f
refactors narsie to use the object oriented programming meme
2014-12-18 11:44:20 -08:00
f0c8f2eeac
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/modules/reagents/Chemistry-Reagents.dm
conflicts resolution
2014-12-16 02:52:08 +03:00
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
8d110ee496
Tiny clean up, still lots of work to do
...
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
f9cf4f233d
Merge pull request #6263 from paprka/gunsthegunnening
...
Guns: the gunnening
2014-12-11 10:46:34 +03:00
5b6039a521
changes to the uplink and further c90 updates
2014-12-07 19:39:24 -08:00
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
738bfe27a4
Not idea why if(_dmm_preloader) fails to catch nulls...
2014-12-03 20:03:47 +01:00
8552a606f9
Minor optimization
2014-11-30 03:11:55 +01:00
d0d82aa187
Add support for the DMM multiple tiles on one turf underlaying
2014-11-28 00:03:54 +01:00
509c07650f
Merge pull request #5802 from paprka/EATITFATTY
...
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
ec6b2424d2
purge the unused
2014-11-13 21:10:53 -08:00
f00d32abc1
Merge pull request #5803 from Menshin/sleeping_in_closets
...
Removes hilarious but useless sleep() in closets/boxes creation
2014-11-11 10:55:07 -08:00
cdd5128d47
Removed hilarious but useless sleep() in closets/boxes New()
2014-11-10 01:59:32 +01:00
bbf2530a3c
Fixes the simple vars list parsing.
2014-11-05 14:15:30 +01:00
96883b31cd
Rewrote maploader to act faster and better handle set variables.
...
Most notably :
* better loading times, less processing loops
* lists variables are now taken into account (simples and associatives)
* every character can now be used inside a string without fear of breaking the loading process
2014-10-26 16:26:48 +01:00
2cec56cebb
Makes the gateway unacidable.
2014-10-12 20:43:15 +03:00
cd60db5e18
Merge pull request #5124 from MrPerson/implant_action_button
...
Give implants an action button
2014-10-11 18:15:44 +02:00
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -07:00
dea5cc4bcb
Give implants an action button
...
Because spells for this is dumb
Featuring activation buttons that totally are 100% coderart.
2014-10-06 21:05:09 -07:00
537280b4b9
Removing many instances of the no longer used second argument of message_admins() proc.
...
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
5e696e9cd7
Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
...
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
37f9716fb5
Added loot tables for the maintenance and the contraband locker (removed the map edit for now)
2014-08-18 05:40:15 +02:00
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
kingofkosmos