paprka
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
Razharas
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
tkdrg
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
paprka
e8738e8dd5
Changes some clothing and chef gear
2014-12-28 02:13:28 -08:00
Razharas
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
Razharas
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
tkdrg
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
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
phil235
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
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
MrPerson
d8b85dda0a
Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
...
refactors narsie
2014-12-24 19:48:24 -08:00
paprka
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
Menshin
de028f4997
Allows setting an associative variable to null.
2014-12-22 16:27:23 +01: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
Hornygranny
cd22bfc11f
refactors narsie to use the object oriented programming meme
2014-12-18 11:44:20 -08:00
Razharas
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
Razharas
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
paprka
db6eabfc4e
intial commit for syndicate hardsuit feature
2014-12-13 22:26:09 -08:00
tkdrg
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
Razharas
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
paprka
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
Razharas
f9cf4f233d
Merge pull request #6263 from paprka/gunsthegunnening
...
Guns: the gunnening
2014-12-11 10:46:34 +03:00
paprka
5b6039a521
changes to the uplink and further c90 updates
2014-12-07 19:39:24 -08:00
paprka
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
Menshin
738bfe27a4
Not idea why if(_dmm_preloader) fails to catch nulls...
2014-12-03 20:03:47 +01:00
Menshin
8552a606f9
Minor optimization
2014-11-30 03:11:55 +01:00
Menshin
d0d82aa187
Add support for the DMM multiple tiles on one turf underlaying
2014-11-28 00:03:54 +01:00
hornygranny
509c07650f
Merge pull request #5802 from paprka/EATITFATTY
...
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
paprka
ec6b2424d2
purge the unused
2014-11-13 21:10:53 -08:00
hornygranny
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
Menshin
cdd5128d47
Removed hilarious but useless sleep() in closets/boxes New()
2014-11-10 01:59:32 +01:00
Menshin
bbf2530a3c
Fixes the simple vars list parsing.
2014-11-05 14:15:30 +01:00
Menshin
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
Perakp
2cec56cebb
Makes the gateway unacidable.
2014-10-12 20:43:15 +03:00
Swag McYolosteinen
cd60db5e18
Merge pull request #5124 from MrPerson/implant_action_button
...
Give implants an action button
2014-10-11 18:15:44 +02:00
paprka
d80be7f689
changes robotics gloves to fingerless gloves
2014-10-08 05:11:30 -07:00
MrPerson
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
phil235
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
Firecage
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
Swag McYolosteinen
5e696e9cd7
Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
...
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
KyrahAbattoir
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
Alex
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
paprka
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
paprka
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
Jordie0608
b2641f9af6
Adds away missions to readme.md
2014-07-31 21:54:55 +10:00
paprka
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
CollenN
2aab5fa71c
Finalizes Mutantrace Datum Update
...
https://github.com/tgstation/-tg-station/pull/3609
Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
ikarrus
4905beb67e
Removes hacky code in favour of a process() check for the nuke disk's location
...
Instead of having a lot of hacky checks to prevent the disk from leaving the Z-level, it will be checked periodically by process() if Z > 2
2014-05-30 22:01:20 -06:00
Cheridan
18ebcc0e45
Merge pull request #3720 from hornygranny/readingrainbow
...
carved books now turn into storage items
2014-05-21 22:16:45 -05:00
