Commit Graph

2314 Commits

Author SHA1 Message Date
oranges d11bb7258a Merge pull request #21529 from Cyberboss/DoTheTruffleShuffle
Storage rustling cleanup/refactor
2016-11-15 16:39:30 +13:00
kevinz000 6581ae2b49 [READY]Slightly buffs Peacekeeper Cyborg Energy Barriers (#21513)
* Update holosign_creator.dm

* Update holosign.dm

* Update holosign.dm

* Update holosign_creator.dm
2016-11-14 19:10:30 +13:00
Joan Lung de1c7b074a Servants of Ratvar can now unsecure and move most Clockwork Structures (#21485)
* Servants of Ratvar can now unsecure and move Clockwork Structures

* anchoring required

* gen

* bleh

* check again

* no stacking wardens, kay?

* alright!

* that too

* smart

* round

* as is done

* hmm

* less effective
2016-11-14 12:47:31 +13:00
Cyberboss 316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
Mysak0CZ 87211b3e3d [ready for review]Minor locker tweaks (#21494)
* you can anchor lockers using wrench, minor tweaks

* AIs and Cyborgs procs addition

* Spelling update

* Removed silicon remote control
2016-11-13 17:14:14 +13:00
KorPhaeron 44e3733e64 Bedsheets now go in the neck slot 2016-11-10 02:12:54 -06:00
KorPhaeron 629bfb6c5e Cloaks are now cosmetic neck slot items (#21418)
* Cloaks are now cosmetic neck slot items

* Re-orders layers so bags will display above cloaks
2016-11-10 09:30:25 +13:00
duncathan salt 076d256a47 small atmos changes to transit tubes (#21411)
* small atmos changes to transit tubes, part 1

* small atmod changes to transit tubes, part 2

* Fully remove redundant proc
2016-11-09 10:07:25 +01:00
Joan Lung 0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit
Easy fix bundle
2016-11-05 19:41:27 -04:00
Joan Lung 241e6e75b8 Merge pull request #21359 from phil235/WindowExplosionBlockFix
reinforced window and telehulk bugfixes
2016-11-05 19:33:15 -04:00
Cheridan 3dd35cc0b1 Merge pull request #21365 from ChangelingRain/glowfixes
You can now proselytize false walls + glow fixes
2016-11-05 18:30:59 -05:00
Cheridan 6a885d9500 Merge pull request #21342 from phil235/TransitShit
Fixes transit tubes
2016-11-05 17:21:24 -05:00
phil235 b8e5bb22bc Moves bodybag closet into the closet folder where they should be.
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
2016-11-05 00:00:28 +01:00
Joan Lung 990942481f You can now proselytize false walls + glow fixes 2016-11-04 11:53:48 -04:00
Joan Lung d4643f032c Proselytizer conversion now accounts for existing materials better (#21334)
* Proselytizer conversion now accounts for existing materials better

* shitfuck.

* move the god damn defines
2016-11-04 15:35:00 +01:00
phil235 8cb3736221 Fixes turf having two contents_explosion()
Fixes hulk plus telekinesis being able to hulk smash things from a distance.
2016-11-04 00:33:51 +01:00
phil235 48af5e5927 Removed another outdated comment 2016-11-03 19:19:32 +01:00
phil235 b0b5a90bd7 Requested changes 2016-11-03 19:03:04 +01:00
phil235 26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235 51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
oranges f57357a049 Merge pull request #21316 from ChangelingRain/unflappable
Plastic flaps are once again immune to being hit in melee
2016-11-03 10:11:17 +13:00
Joan Lung 02e54446d8 Hulks no longer oneshot literally every clockwork structure (#21283)
* Hulks no longer oneshot literally every clockwork structure

* rrrrr

* why the fuck did you ask me to make this a proc????

* hulks, why.
2016-11-02 22:52:42 +13:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Cheridan 37c6f1e1ae Merge pull request #21310 from ChangelingRain/gearbits
Brass windows and windoors no longer drop full sheets of brass when destroyed
2016-11-01 09:09:51 -05:00
Joan Lung 883e7f745b Plastic flaps are once again immune to being hit in melee 2016-10-31 18:06:33 -04:00
phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
Joan Lung d0f0b74957 Clockwork windows and windoors no longer drop full sheets of brass when destroyed 2016-10-31 10:27:31 -04:00
Joan Lung 8cf817cfec Brass windows are now slightly harder to destroy 2016-10-30 11:51:21 -04:00
oranges d3bbe1634e Merge pull request #21248 from lordpidey/wallfix
Falsewalls are now less obvious on inspect
2016-10-30 19:16:32 +13:00
Joan Lung 7262c16328 Merge pull request #21243 from lzimann/selflog
You can see your own attack log once again
2016-10-29 15:50:55 -04:00
Mike Long 4bd80f021d Fixes #21240 2016-10-28 20:52:03 -04:00
Joan Lung df4bc0a093 Fixed a few bugs with clockwork proselytizers (#21221)
* Fixed a few bugs with clockwork proselytizers

* condensed

* formatting

* proselytizer.

* i need more sanity checks I think this crashed something

* proper!

* better desc

* sanity! SANITY!
2016-10-29 11:34:03 +13:00
Lzimann 90d76b652c You can see your own attack log once again 2016-10-28 17:35:22 -02:00
chowdermcarthor c7e474ccae Neck Slots (#21169)
* Added in a neckslot. Moved some tie items over to said neckslot.

* Changng some stuff to fix the new neckslot items.

* no message

* Altered comment to say that the old tie system is being kept as-is due to armbands and such instead of just avoiding conflicts.

* no message

* Changed the number for this.

* Fixed jaws of life not having a category, thus they only would show up when searched.
2016-10-26 19:03:41 +13:00
Lzimann e34a1c3eb4 Fixes axes being placed in the tile. 2016-10-22 19:19:33 -02:00
Screemonster 60180cb0fd Makes the antitamper mechanism prevent tampering 2: electric boomaloo (#20893)
* Sanitises input on abandoned crates

* Makes anti-tamper mechanisms detect tampering.

* Makes explosion trigger on take_damage() instead.
2016-10-21 15:30:46 +13:00
Joan Lung 7f89fdf39f The range for combat-y visible messages is now a define (#21077) 2016-10-21 15:20:14 +13:00
phil235 1ce672c630 fixing stuff about atom_colours. 2016-10-21 01:30:42 +02:00
Cyberboss b0a74281dd Someone call that chick from the italian job because this isn't the Worthington 1000 (#21046) 2016-10-20 12:48:15 +02:00
Cheridan bd51c9ad1a Merge pull request #21034 from ChangelingRain/magicbrassbullshit
Things made out of magic ratvarian brass are immune to fire and acid
2016-10-19 13:03:37 -05:00
phil235 186c02595a fixing a typo 2016-10-19 01:58:15 +02:00
phil235 240f3a4c49 Adding var/list/atom_colours to /atom .
The var will be used to store the various coloring that happen for the atom so that we can separate paint coloring from color that must be inherent to the atom (an initial color for example), or from certain coloring effect like revenant's blight, mob electrocution's black color, admin edit of the color var, green color from holding the greentext item, etc.
The list has four elements, used for four categories:
ADMIN_COLOUR_PRIORITY for admin varedits and very rate color effect like holding the greentext item (and other effects that should prime over any other potential source of coloring even temporary effects).
TEMPORARY_COLOUR_PRIORITY for short color effects like revenant blight on mob, mob electrocution making you all black for a couple seconds, effects that should be appearing above paint coloring.
WASHABLE_COLOUR_PRIORITY for pretty much all paint coloring like colorful reagent on mobs, coloring turfs with paint, etc.
FIXED_COLOUR_PRIORITY for color inherent to the atom, like a blob's color, any object with a color value given in its definition.

Fixes electocution animation on mob not making the mob all black (with the skeleton overlay blinking over it)
Spray cleaner and soap can now wash paint off mobs, turfs and objects.
2016-10-19 01:51:30 +02:00
oranges 86a8d8a7f5 Merge pull request #20962 from phil235/hit_message
No more message spam when you witness someone being attacked or shot
2016-10-18 09:17:41 +13:00
oranges 25daa7b5f1 Merge pull request #20992 from swindly/spelling
Fixes various spelling/grammar/punctuation errors
2016-10-18 09:15:32 +13:00
oranges d165c98420 Merge pull request #21018 from Shadowlight213/revert-20774-ClickAss
Revert "Makes drag/drop that dont have any use call click"
2016-10-18 09:14:09 +13:00
TheCarlSaganExpress 4a93709088 The welder can be used to fix the display case and fire axe cabinet. (#20920)
* Fixes #20747.
You may now use your ID to unlock the display case.
Fireaxe cabinet and display case may now be repaired with the welder.

* Welder amount.

* Fire axe welder amount.

* Adds comments to the display case

* Captains display case now requires specops access
2016-10-18 09:08:42 +13:00
Joan Lung 9b61e7b638 Things made out of magic ratvarian brass are immune to fire and acid 2016-10-17 15:53:27 -04:00
Cheridan 521dbbbabc Merge pull request #21006 from phil235/xenoeggfix
Fixes xenomorph not being able to open their eggs.
2016-10-17 13:48:08 -05:00
Shadowlight213 18709e5ad7 Revert "Makes drag/drop that dont have any use call click" 2016-10-16 12:41:42 -07:00
phil235 a7a8b11eff Fixes xeno attacking nests instead of unbuckling. You now attack the nest on harm intent and unbuckle on all other intents. 2016-10-16 20:12:51 +02:00