Commit Graph

2286 Commits

Author SHA1 Message Date
Razharas acca364c50 Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
Xhuis 352500d341 Sprites bo staff, adds custom martial art 2015-06-27 15:32:54 -04:00
TheVekter 50c1fc487e Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit 2015-06-26 23:49:43 -05:00
TheVekter 27b5d59d28 Ports over the military jacket from NTStation 2015-06-25 02:44:25 -05:00
Jordie0608 58399f7602 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/items.dmi
2015-06-24 20:31:51 +10:00
Cheridan 62e635484a Merge pull request #10069 from Ikarrus/gangrecruitnerf
Gang Update: Recruitment Edition
2015-06-23 14:33:13 -05:00
Ikarrus 67ec200bc7 Few More Changes 2015-06-23 09:12:56 -06:00
Ikarrus 3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Cheridan acda822392 conflict fix icon files 2015-06-22 23:03:18 -05:00
Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet
Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi
2015-06-22 22:57:53 -05:00
Remie Richards f5f833ecbb Merge pull request #9971 from KorPhaeron/newfloors
New Bluespace/Sepia slime reactions, new var for turfs
2015-06-23 03:43:28 +01:00
Cheridan 47c290af63 Merge pull request #10053 from kyrahabattoir/iconfix
Removed the duplicate glass_structure icon.
2015-06-21 10:32:13 -05:00
Swag McYolosteinen 859c5e66e0 Merge pull request #9930 from duncathan/givinunarysomelovin
Brings some unary devices closer to the present
2015-06-20 20:14:02 +02:00
Cheridan 49bbbe5994 Merge pull request #10036 from pudl/32-zel
Resprites deskclutter
2015-06-20 12:55:05 -05:00
Swag McYolosteinen 7929b7dcd7 Merge pull request #10031 from Ikarrus/gangfashion
Gang Update: Fashion War Edition
2015-06-20 18:06:19 +02:00
KyrahAbattoir aab507eeaa Removed the duplicate glass_structure icon. 2015-06-20 17:55:05 +02:00
Jordie0608 538d4ad303 Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
2015-06-20 18:37:39 +10:00
Jordie0608 25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-06-20 17:32:16 +10:00
Ikarrus b89602c972 Squashed commits 2015-06-19 18:45:46 -06:00
Xhuis d886f1d1a2 Conflicts 2/2 2015-06-19 11:24:33 -04:00
Xhuis 2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Xhuis 3341011894 Conflicts 1/? 2015-06-19 11:23:36 -04:00
pudl 3689c0e080 resprites deskclutter 2015-06-19 06:32:05 -05:00
Ikarrus e27cdc7efe Resolved Conflicts:
code/game/gamemodes/gang/dominator.dm
2015-06-18 23:05:51 -06:00
Xhuis ebc5352b56 Conflicts 3/3 2015-06-18 23:37:53 -04:00
Xhuis e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
Xhuis 37922bfb9d Conflicts 2/3 2015-06-18 23:36:51 -04:00
Xhuis e93411b1d3 Conflicts 1/2 2015-06-18 23:36:05 -04:00
Ikarrus 46a5e578e4 Gang Update: Fashion War Edition
This update primarily deals with gang outfits and expands on how they affect the round.
2015-06-18 20:01:57 -06:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Thunder12345 19576269cf Merge branch 'master' of https://github.com/tgstation/-tg-station into autoshotgun
Conflicts:
	icons/obj/guns/projectile.dmi
2015-06-18 17:12:58 +01:00
Cheridan 470f21a752 Merge pull request #10004 from Ikarrus/gangimplants
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
Thunder12345 a72180a79d Changed combat shotgun sprite for 50% more tacticool. 2015-06-17 18:54:04 +01:00
phil235 a372b6ffc7 Merge pull request #9940 from Ikarrus/deptmanagement
[Boxstation Edit] Department Management Console
2015-06-17 19:46:44 +02:00
Ikarrus 556b25aec3 Added 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis. 2015-06-17 09:36:15 -06:00
Cheridan c7029ff806 Merge pull request #9799 from kyrahabattoir/glassUtility
Mapping tool: adds a "structure" spawner that can be used to create "…
2015-06-16 13:25:00 -05:00
Xhuis 81288be292 Conflicts 2/2 2015-06-16 11:43:29 -04:00
Xhuis 3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
Xhuis cb11be5ec6 Conflicts 1/2 2015-06-16 11:42:29 -04:00
Cheridan 7aba70ecf3 DRAGnet lives! 2015-06-15 23:55:28 -05:00
KorPhaeron ce933a1a97 Slaughter Demon (again)
Had to recreate because I couldn't resolve the merge conflict.

New side event/antagonist. Simple animal that can use pools of blood as
portals to move around the station. Spooky scary.

-CtrlClick on an adjacent blood pool (or turf with blood on it) to
"enter" (start an infinite duration jaunt
-CtrlClick on a blood pool while jaunted to exit at that pool
-If you're pulling a mob while you enter a pool, the mob gets pulled in
with you, and you devour them, healing yourself
-Night vision

Adds an event (admin only) that spawns one.

Adds wizard item for summoning it. Has objective to kill the wizard (and
everyone else).

Also fixes typo/filepath for the scrying orb in the new wizard datum
thing.

If someone could help me with mind stuff so I can track how many people
it eats that'd be great.

Webm

http://www.singulo.io/tg/src/1433549232359.webm
2015-06-15 09:41:03 -05:00
KorPhaeron 99735ea50d New floors from xenobio/new var for turfs
Turfs now have a slowdown var that will determine how fast mobs move on
it.

Bluespace slimes can now create bluespace floor tiles which give -1
slowdown using blood

Sepia slimes can now create sepia floor tiles which give 2 slowdown
using blood

Camera and film reactions merged into a single water reaction

Bluespace crystal reaction moved to plasma
2015-06-15 01:33:00 -05:00
Ikarrus e44b184075 Merge branch 'master' of https://github.com/tgstation/-tg-station into deptmanagement
Resolved Conflicts:
	code/game/machinery/computer/card.dm
	icons/obj/computer.dmi
2015-06-14 09:50:56 -06:00
Cheridan 565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
Overlays for computers
2015-06-14 10:25:27 -05:00
Jordie0608 51106be4ec replaced icon with image 2015-06-14 17:49:45 +10:00
Ikarrus 75a311dc8c Department Management Console
Originally conceived to manage budgets that can be used to buy things from cargo without their approval. But now it's just a limited ID console, but available in every Command Staffer's office.

- Can only modify access to their own department, regardless of what ID is used to log in
- Any department head can use these to promote/demote those in their department, including those who have access that you clearly do not remember authorizing
- Can be modified to change the access of other departments by using a multitool on the circuit board.
2015-06-13 12:55:24 -06:00
Jordie0608 3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
Jordie0608 5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
duncathan dab13732fe cleans up icon paths; modifies certain unary devices
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
  they no longer override update_icon() but instead update like just about every other device
  eventually I'll give these real sprites but given that they're unused it can wait for now
  sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
  because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
2015-06-13 02:43:17 -06:00
duncathan f8033c33de cleans up a bunch of atmos icons
cold_sink.dmi, heat_exchanger.dmi, oxygen_generator.dmi have been merged with unary_devices.dmi
valve.dmi, digital_valve.dmi have been merged with trinary_devices.dmi
  these contained icons for trinary valves; binary valves are already in binary_devices.dmi
pipes2.dmi, dp_vent_pump.dmi, portables_connector.dmi, vent_pump.dmi, pipe_vent.dmi removed
  completely unused/redundant
obj/atmospherics/pipe_tank.dmi moved to obj/atmospherics/pipes/pressure_tank.dmi
obj/pipes/ moved to obj/atmospherics/pipes/
obj/pipes.dmi moved to obj/atmospherics/pipes/simple.dmi
obj/atmospherics/pipe_manifold.dmi moved to obj/atmospherics/pipes/manifold.dmi
removed unused/redundant icon states in simple.dmi
2015-06-12 21:18:18 -06:00