Commit Graph

159 Commits

Author SHA1 Message Date
GunHog 8a592b4f39 MERGE CONFLICTS SUCK
Stupid Bolas
2016-02-29 11:28:49 -06:00
GunHog 67b0bda45a Hardsuit Jetpack Upgrade
Replaces the mining jetpack with the hardsuit jetpack upgrade.
2016-02-28 18:37:27 -06:00
PKPenguin321 d9a214e931 adds bolas
adds the item itself and a hand-crafting method to handcuffs.dm
adds a tablecrafting recipe to recipes.dm
adds the sprite to items.dmi
2016-02-26 17:59:55 -08:00
TrustyGun e182cf0f2e Makes it more clearer these are meant for pranks 2016-01-30 12:18:21 -05:00
Nerd Lord 1e6bb6c29c Updates construct sprites for consistency.
This doesn't mean they have better lighting, just that they're consistent for the most part(sorry wj it's not that good)
2015-11-28 19:33:34 -05:00
Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
bgobandit e7555de606 Adds the ability for chemists to turn gibs into soap. Gibs can now be scooped. 2015-10-13 20:01:49 -04:00
Remie Richards b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Remie Richards 131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards 58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
Xhuis 1178fbe079 Major cult changes
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
Cheridan 63698004d6 Fixes Conflicts, Also Structural Code Stuff 2015-08-08 20:16:53 -05:00
c0 2504affdcf Better sprites for bed and bedsheets 2015-08-04 15:39:28 +03:00
Steelpoint f96fdab622 CuffSprites 2015-07-15 19:38:29 +08: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 acda822392 conflict fix icon files 2015-06-22 23:03:18 -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
Jordie0608 77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
Firecage 30cd4ff558 Once more updated welder sprites, final round. 2015-05-06 16:29:11 +02:00
Firecage cd92d28b0b New welding tools sprites 2015-05-06 13:38:06 +02:00
Firecage 2cc2a59942 Slightly modified upgraded industrial welding tool sprite. 2015-05-06 10:18:25 +02:00
Firecage 8e79448c11 New sprites and name 2015-05-05 22:30:48 +02:00
Sawu 6103b2a5e1 Fixes Spraycans not coloring faces correctly
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
ACCount12 cda61c1075 Welder&toolboxes update 2015-04-01 10:43:22 +12:00
ACCount12 1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
dannno 8bbbcacbb1 gavel block sprite changed 2015-03-23 21:14:40 -04:00
dannno 3254142b21 adds hammer and gavel 2015-03-22 20:22:27 -04:00
MMMiracles 1b1ee50b00 ASS BLAST USA USA USA USA 2015-03-09 17:50:37 -04:00
pudl ddad8c41ef resprites fire extinguishers 2015-03-01 14:55:58 -06:00
Iamgoofball c119fede36 sponsored by DaZe 2015-02-13 23:40:43 -08:00
paprka 88760896ad initial commit 2015-02-13 20:59:39 -08:00
paprka 6648390bf5 Merge branch 'master' of https://github.com/tgstation/-tg-station into rodslel
Conflicts:
	icons/obj/items.dmi
2015-02-03 22:24:00 -08:00
paprka 50e152f402 rods 2015-02-02 00:20:22 -08:00
paprka 1ce5722eac map conflicts and other changes 2015-01-31 23:14:12 -08:00
paprka 39d5fa01d8 update, gauze, etc 2015-01-21 15:06:21 -08:00
pudl 2b38db2332 two medical resprites
resprites medical patches. they used to be enormous ugly bandaids.
http://puu.sh/ewJGZ/c08d54007a.png

resprites brute packs. they are now blue, instead of green.
http://puu.sh/ewJIF/579429b584.png
2015-01-14 17:29:21 -06:00
tkdrg a94012b98a Ports the rapid pipe dispenser (RPD) from /vg/
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.

Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03:00
xxalpha b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00
phil235 b971a09bcd Wrapping something with package wrapper now gives a message.
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02:00
Cheridan f0a214910e readding permit icon 2014-10-11 17:49:44 -05:00
paprka d61e4ac943 big commit, handcuff overhaul 2014-10-08 13:19:54 -07:00
paprka 1aff1d6c20 welding tool updates 2014-10-06 18:04:47 -07:00
TZK13 0580bee6fc Changes a few green crosses to blue on sprites that I missed last time. 2014-10-04 19:37:10 -05:00
Cheridan 08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
TZK13 1d745860ac Changes a few green crosses to blue on sprites that I missed last time. 2014-09-30 13:16:52 -05:00
Firecage c6a386a13a Conflict fix 2014-09-05 09:51:25 +02:00
Cheridan da5b68e7ee stop asking how crowbars fit in your pocket fffff 2014-08-31 13:02:04 -05:00
Firecage 834f9a05b9 Mineral flooring 2014-08-31 17:12:17 +02:00
TZK13 e689130c03 Makes Greenbay into Bluebay, take two. 2014-03-17 22:25:57 -05:00
Ergovisavi 892ffd3879 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 2014-02-09 22:37:20 -08:00