Commit Graph

744 Commits

Author SHA1 Message Date
Jordie 94de5c997e Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
GunHog 4659724851 Mini-Fix for flashlighting invalid helmets
I am going to expand on it later.
2015-03-21 02:52:05 -05:00
Swag McYolosteinen 517e1f9c83 Merge pull request #8418 from Incoming5643/Absolute_territory
Adds absolute territory
2015-03-20 17:10:41 +01:00
GunHog 46ca095f2b Tweaks and fixes
- You can now make Securitrons with Sec helmets.
- Helmet cameras now function as borg cameras do. They will update the
chunk on the next game tick, if the camera is moved.
- Helmet cameras are now vulnerable to EMP (camera alarm is not
triggered)
- Removed the extra canAttachCam lines.
- Paid my tithe to Lord of Changelogs.
2015-03-20 09:39:50 -05:00
GunHog e1668e985f Attachable Seclite & Camera to Helmet
Steals #8109
2015-03-19 23:40:37 -05:00
Jordie 0cdd34ee05 Merge pull request #8354 from MMMiracles/hardsuit_upgrade
Revamps ERT suits to use helmet toggle
2015-03-19 16:45:05 +11:00
Jordie b2953d71c7 Merge pull request #8263 from dannno/glasses
cosmetic glasses n shit
2015-03-19 16:44:20 +11:00
Jordie e5fdddc7d8 Merge pull request #8289 from Xhuis/alt_clicking
Allows alt-clicking for some stuff
2015-03-19 16:43:53 +11:00
Incoming 563b65e9d4 adds a tiny little personal fix for female outfit generation now that people are using alt styles in this way 2015-03-18 19:16:45 -04:00
Incoming 0d2837935b Adds absolute territory 2015-03-18 17:13:50 -04:00
MMMiracles 5cc3b68d6a pong 2015-03-15 05:22:07 -04:00
MMMiracles 05097332ce ding 2015-03-15 05:08:29 -04:00
MMMiracles abb835b487 revamps ERT hardsuits to use the helmet toggle, organizes the listing to be slightly better looking. 2015-03-15 02:03:18 -04:00
Cheridan 52dfa42eb5 Merge pull request #8257 from phil235/ReflectFix
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
Cheridan 6e26db3783 Merge pull request #8288 from Ahammer18/Sensors
Toggle/Adjust suit sensors
2015-03-13 14:45:08 -05:00
Cheridan 28f6aae00c Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
Conflicts:
	icons/mob/back.dmi

remie is a nerd btw
2015-03-12 20:47:11 -05:00
Xhuis 424d6d305e Re-adds flip verb 2015-03-11 17:32:35 -04:00
Xhuis 3bf0c7015a Replace some object verbs with alt-clicking 2015-03-10 21:28:13 -04:00
Ahammer18 d2b650ad44 Changed "Toggle Suit Sensors" to "Adjust Suit Sensors" because we now have a menu that pops up when you want to change your suit sensors. 2015-03-10 18:20:14 -05:00
MMMiracles 552232496b typo fix 2015-03-10 09:18:12 -04:00
MMMiracles 04a78be390 adds the freedom eagle, the only true friend a patriot can find within the region of socialist space. 2015-03-09 22:09:21 -04:00
dannno 040817ef61 adds a bunch of cosmetic glasses 2015-03-09 19:32:20 -04:00
Remie Richards 370a7100c7 Moves ninja shoes into the ninja folder 2015-03-09 23:02:26 +00:00
MMMiracles 1b1ee50b00 ASS BLAST USA USA USA USA 2015-03-09 17:50:37 -04:00
Remie Richards f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
phil235 4071f25270 Simplifies laser reflection code, no more reflect_chance var at the obj/item level. 2015-03-09 12:28:35 +01:00
Cheridan e846a6eeb4 Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
Conflicts:
	code/game/gamemodes/wizard/spellbook.dm
	icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
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
Sometinyprick e5b53f2e3c Finishing up 2015-02-21 01:26:58 +00:00