Commit Graph

715 Commits

Author SHA1 Message Date
hornygranny d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
Swag McYolosteinen a341fd72b0 Merge pull request #8065 from paprka/squiddeath
Rebalances thermals
2015-03-05 19:14:57 +01:00
Swag McYolosteinen 372e082c66 Merge pull request #8013 from paprka/altclick
Alt-click for aesthetic toggling
2015-03-05 19:12:07 +01:00
phil235 d2d0888432 Merge pull request #7726 from xxalpha/traymesons
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
xxalpha c063665a84 Remove unnecessary check. 2015-03-02 18:15:51 +00:00
xxalpha fd958372a3 Fixed a bug. 2015-03-02 17:41:59 +00:00
xxalpha 42dd431e6f Removed duplicate code.
Removed more duplicate code.
2015-03-02 17:24:40 +00:00
Cheridan 73658a8c0b Updates SSU, Reprices Explosive Implants 2015-03-02 00:09:37 -06:00
Cheridan a9449f674d Nuke Op Hardsuit Refactor 2015-03-01 23:51:30 -06:00
danno "big fucking moron" gonzales 49fc3d290c move alt_desc to obj/item/clothing 2015-02-28 11:02:58 -05:00
paprka 862c66ac63 rebalances thermals 2015-02-28 05:12:27 -08:00
xxalpha f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
paprka b86e79875c readds verb for rolldown 2015-02-26 16:10:03 -08:00
dannno 9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno 626bb9ffcc THE OWL RETURNS: PART 3: ESCALATION
- adds The Owl hardsuit (admin spawn only, reskinned nukeop suit)
- changes nuke op hardsuit toggle proc to be more general, for more unique hardsuits
- removes armor from owl/griffin wing costumes (it didn't make sense anyways)
2015-02-26 13:59:09 -05:00
paprka d9856cde1f small leftovers fix 2015-02-26 01:47:49 -08:00
paprka 6d6c568fc2 benis. 2015-02-26 01:43:07 -08:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
dannno 44ea489940 THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN
- adds The Griffin costume to the autodrobe
2015-02-23 17:30:17 -05:00
dannno e8fb3d1f05 THE OWL RETURNS: PART 1: THE PLASMA RISES
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
2015-02-23 16:49:17 -05:00
WJohn 537d76dbd9 Merge pull request #7684 from dannno/sechardsuitresprite
Sec Hardsuit Resprite/HoS Hardsuit
2015-02-23 16:02:51 -05:00
hornygranny c0c8a739e2 Merge pull request #7721 from paprka/miening
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
Cheridan fe3764dae8 Merge pull request #7765 from Thunder12345/glovening
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
phil235 7af2e457c8 Merge pull request #7705 from GunHog/NVG_Mesons
Adds NVG Mesons
2015-02-20 17:44:38 +01:00
Remie Richards 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
hornygranny 0cd74ff882 Merge pull request #7717 from phil235/sechailerAdjustFix
Fixes the cyborg sechailer being adjustable.
2015-02-18 21:50:12 -08:00
dannno 29f48bfda4 conflicts more like con-fixed 2015-02-18 16:20:46 -05:00
Thunder12345 d906b87a8e Description change
Added the regular insulated glove description to the start of the fake
glove description.
2015-02-16 12:52:40 +00:00
Thunder12345 702419f265 Merge remote-tracking branch 'upstream/master' into glovening 2015-02-16 12:24:06 +00:00
Thunder12345 9f471cb7e4 Reworks fake yellows
Replaces the varedited white gloves in the maint loot spawner list with
a subtype of insulated gloves, with the siemens coefficient changed to 1
and a different desc.
2015-02-16 12:20:06 +00:00
Incoming c2c015a91a Fixes conflicts, fixes casually worn uniforms looking weird 2015-02-15 13:07:06 -05:00
dannno 0fb9ae24e5 Merge branch 'master', repair conflicts, add changelog 2015-02-15 12:09:24 -05:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
xxalpha 28d1e9bad2 Several additions and new sprites.
Reverts glasses.dm
2015-02-14 19:24:41 +00:00
xxalpha 03a8942a9c Fix runtimes. 2015-02-14 16:47:00 +00:00
xxalpha 692389f25b Adds Mesons+T-Ray goggles.
Remove comment.

Move meson t-ray goggles code to a new file.

Removed comments.
2015-02-14 14:47:32 +00:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
paprka 88760896ad initial commit 2015-02-13 20:59:39 -08:00
phil235 a545af2e4a Fixes the cyborg sechailer being adjustable. 2015-02-14 00:30:31 +01:00
dannno 39e4af6c72 update sec hardsuit sprites, fix armor values 2015-02-13 14:04:38 -05:00
GunHog 50576c367f Adds NVG Mesons
- Adds Night Vision Optical Mesons Scanners to RnD.
2015-02-13 12:23:07 -06:00
dannno d3a439a0a1 Changes the sec hardsuit to be slightly more armored and HoS exclusive, armory hardsuits are now slimmer 2015-02-12 15:53:37 -05:00
Incoming 6811835f41 Modifies the fitted var to allow for clothing that looks good with female uniform generation save for the dickpixel(tm), FEMALE_UNIFORM_TOP.
Reclassified uniforms as needed. Most uniforms can now get some sort of variation without any sort of visual weirdness.

Uniforms with "enhanced" chests continue to be excluded for that very reason, ironically.
2015-02-10 17:56:55 -05:00
TZK13 d78322bb42 Adds new schoolgirl uniform colours and adds ties and black skirt to clothesmate. 2015-02-10 06:47:13 -06:00
TZK13 b3f164e131 Ports plaid skirts from Baystation12. 2015-02-10 06:10:26 -06:00
paprka c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
Swag McYolosteinen 6fab02e7cd Merge pull request #7546 from TZK13/Purple-Shorts
Adds purple shorts
2015-02-05 18:16:14 +01:00
Swag McYolosteinen 574fc61c83 Merge pull request #7543 from TZK13/Work-Boots
Adds work boots for engineers
2015-02-05 18:15:28 +01:00
TZK13 01bf5b343f Adds purple shorts. 2015-02-04 01:23:58 -06:00
TZK13 8400ec9800 Adds work boots and fixes character setup previews. 2015-02-04 00:32:15 -06:00