3e5e9086c0
fix
2015-12-01 21:52:35 -06:00
77b841fe9b
Merge pull request #13305 from KorPhaeron/hardhat
...
Removes relative pathing in hardhat.dm
2015-11-29 17:30:27 -06:00
dfc025db36
Missed some lines
2015-11-28 23:14:38 -06:00
5ef5a57f73
removes relative pathing
2015-11-28 23:10:14 -06:00
1b0bfaaef9
creates snowman head
...
Signed-off-by: swankcookie
2015-11-28 00:30:09 -06:00
49ad07b58c
Aligns helmet properly
2015-11-27 14:28:44 -06:00
86e98947c3
Updated Templar Armour
2015-11-27 14:01:25 -06:00
79550bf8ac
Updated sprites
2015-11-27 13:34:23 -06:00
c8f3ca728f
Adds Knight Armour
2015-11-25 15:46:54 -06:00
5cdeabe0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into cakehatbugs
...
Conflicts:
code/modules/clothing/head/misc_special.dm
2015-11-15 16:30:03 -05:00
ff05c5323f
Merge pull request #12583 from Steelpoint/Beret
...
[NERF/ARMOUR] Lowers Sec Beret Defence To Helmet Value
2015-10-23 08:04:56 -05:00
23f4ee77ea
BeretChange
2015-10-22 15:08:40 +08:00
7f6dc9555f
Fixed
2015-10-14 17:21:08 -05:00
a634d707c2
Cake hats now properly emit light.
2015-10-14 18:02:27 -04:00
3c788fcc59
Fixes Atmos fire helmets spawning in the wardrobe closet instead of the atmos closet.
...
Fixes Toggle Helmet light verb on security helmet with seclite attached being usable while dead.
Fixes Lizard snout is poking through helmet
Fixes Space helmets not hiding masks and glasses (especially the large gar glasses)
Eva harsuit helmet no longer has a semi transparent part (incompatible with hiding masks and glasses, and causes lizard snout protruding from that helmet)
Made equip_to_slot() and unEquip proc more OOP at the carbon level which removes some duplicate code between monkey and human.
Readding code\modules\mob\living\carbon\brain\login.dm that someone (probably me) unchecked some time ago by mistake.
2015-10-12 21:50:59 +02:00
c4c447a8dc
Fixes hotspot having two New() procs.
...
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
f9604f8f8a
2 minute cooldown
2015-09-30 09:23:40 -07:00
b267807d00
Var definition in wrong place
2015-09-29 20:47:26 -07:00
1b677a7cee
Candycorn
2015-09-29 20:41:22 -07:00
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
1132344628
Rice hat by scones
2015-07-30 21:13:43 +10:00
76feff5dfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix
...
Conflicts:
code/game/objects/structures/watercloset.dm
code/modules/clothing/head/helmet.dm
code/modules/mob/living/carbon/carbon.dm
2015-07-20 22:37:06 +02:00
b2f9be0e29
Merge pull request #10689 from tgstation/revert-10345-HoSArm
...
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-20 02:09:38 -03:00
2d3c289234
Merge pull request #10642 from MMMiracles/flukeops
...
removes conspiracy theory
2015-07-19 13:31:54 -04:00
d39a2ef5db
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-18 07:51:17 -05:00
9394e570ae
Merge pull request #10643 from KorPhaeron/soundfix
...
Fixes sounds cutting out halfway
2015-07-18 00:03:23 +01:00
4eedf27627
Makes SWAT helmets space-proof again.
2015-07-17 14:59:47 -04:00
d72cbcaf2f
- fixes handcuff overlay on monkey not showing.
...
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
2015-07-17 01:15:21 +02:00
3537d754b3
Merge pull request #10345 from Steelpoint/HoSArm
...
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
2015-07-16 11:29:22 -04:00
867b43a5a3
re-adds the black/red striped variant for fluke ops. also hunke.
2015-07-16 00:48:42 -04:00
d372bae224
I did it backwards help
2015-07-15 18:03:12 -05:00
1994070b3b
Changes
2015-07-15 17:59:50 -05:00
7c5a90c5e9
Fixes sounds cutting out
2015-07-15 17:35:15 -05:00
7b546709b9
removes any source of connection between nanotrasen and syn- i mean removes possible conspiracy theories caused by stolen nanotrasen equipment.
2015-07-15 18:11:32 -04:00
4688c2c969
Fixes proc arguments
2015-07-15 23:52:35 +02:00
12580ec5da
Fixes siren helmet spam
...
Volume has been greatly reduced, and the cooldown has been raised sightly to give short bursts of silence between sirens.
2015-07-09 12:25:56 -07:00
1e727e34eb
BulTo40
2015-07-05 19:05:09 +08:00
bc2592eb5a
Merge pull request #10222 from MMMiracles/freedomsocks
...
Adds patriotic apparel for upcoming 4th of July (and inferior countries too I guess)
2015-07-04 10:04:46 +03:00
a3f5be0b21
HoSArmour
2015-07-03 21:08:21 +08:00
256f0adeb6
Merge pull request #10280 from optimumtact/securitycamerasreduxion
...
Remove security cameras for real
2015-07-02 22:42:50 -05:00
cfb5e724b6
Material container, all items can have materials, wake me up
...
cant wake up
go to sleep debug
2015-07-01 03:34:47 +01:00
e587e0c077
Remove helmeted mounted cameras from game
2015-06-30 16:08:48 +12:00
0ab6b99658
Flag cleaning.
2015-06-29 00:08:49 +01:00
224ec328b1
Adds Canada.
2015-06-28 14:15:24 -04:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
16504ef0cf
Cleaned some clothing flags. Ported turf/Entered optimization from vg.
2015-06-23 01:52:14 +01:00
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
swankcookie
duncathan salt
KorPhaeron
KorPhaeron
bgobandit
Cheridan
Steelpoint
phil235
bear1ake
c0
Jordie0608
Aranclanos
WJohn
Remie Richards
MMMiracles
Firecage
MrStonedOne
Razharas
xxalpha
oranges
Ikarrus
Xhuis
phil235