Commit Graph

2387 Commits

Author SHA1 Message Date
Cheridan 75f404b326 Merge pull request #17337 from ChangelingRain/innatecomms
Cult communication is now innate and has an action button
2016-05-03 20:23:52 -05:00
Nerd Lord 0897f3bc20 Cult communication is now innate and has an action button 2016-05-02 09:11:06 -04:00
c0 20c64fbfbf Blood brood 2016-05-01 17:19:29 +03:00
Jordie c5812d625e Merge pull request #17263 from lzimann/hogstuff
Some Hand of God fixes
2016-05-01 17:45:56 +10:00
Jordie 265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit
View vars will now tell you if something has been previously var edited
2016-05-01 17:02:02 +10:00
Cheridan 5a766b0a63 Merge pull request #17236 from optimumtact/patch-2
Fix call to add reagent for inacusiate
2016-04-30 05:27:14 -05:00
Cheridan 7644c7f47c Merge pull request #17235 from optimumtact/patch-1
Prevent negative sqrts in dna heal
2016-04-30 04:21:15 -05:00
Jordie 53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
Lzimann 381c7e605c Some HoG tweaks
- Automatic nexus placing time changed to 15 minutes(from 2)
- Follow button for divine telepathy for ghosts
- Divine telepathy's color is now God's color.
- Prophet's gear(hat and staff) prioritizes the backpack instead of automatically equipping.
- CTF spawn protection trap is no longer constructable
- Added follow buttons in check antag panel(admins)
- Changed the order of traitor panel for HoG
2016-04-30 00:42:09 -03:00
Cheridan d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron 0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
oranges 622b130be9 Proper call to add reagent
Fixes runtime
2016-04-29 21:39:53 +12:00
oranges a52cba944b Prevent negative sqrts in dna heal 2016-04-29 21:17:05 +12:00
Incoming 10b966b97c View vars will now tell you if something's been previously var edited 2016-04-28 19:38:21 -04:00
phil235 750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
MrPerson b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
LatD 12f9d205e8 Syndicate bomb delay wire changed to one time use (#16790)
* Syndicate bomb delay wire

* Fixes delay wires

* Add bomb delay variables

* Forgot to remove unused var

* Small fix
2016-04-26 23:28:01 +02:00
phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
Joan Lung ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
duncathan salt 61ddd6797d Merge pull request #16969 from YotaXP/tgm-maploader
[DNM] Updates the map loader to support TGM style map files
2016-04-25 09:28:26 -06:00
Jack Edge b9bd58de88 Grammar fixes 2016-04-25 16:28:16 +01:00
phil235 fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235 0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235 0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge a89d951669 Removed whitespace 2016-04-24 15:42:20 +01:00
Jack Edge 1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
Jack Edge 2f26b8eabc Compilation! 2016-04-24 13:54:37 +01:00
Jack Edge 0fd1f3c7e4 Made /datum/dog_fashion 2016-04-24 13:18:43 +01:00
MrPerson 3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00
KorPhaeron fa82df9982 Merge pull request #17035 from LanCartwright/synapviro
Reworks sensory.dm
2016-04-23 15:05:14 -05:00
PKPenguin321 70926d0c7d removes a comment by remie's request
this is the worst commit ive ever made
2016-04-21 16:43:01 -07:00
Akke dedf15c2c5 Reworks sensory.dm 2016-04-21 19:30:28 +01:00
PKPenguin321 5aadc0494a fixes conflicts 2016-04-18 16:30:16 -07:00
YotaXP 2072670afd Clean up magic numbers. 2016-04-18 18:28:44 -04:00
YotaXP 0d8cc8aee7 Make the loader use ChangeTurf() for turfs. 2016-04-18 17:41:05 -04:00
YotaXP 03d38bf895 Adds a 'measureOnly' mode to the maploader code for templates. 2016-04-18 16:04:35 -04:00
coiax e7ad4047df Admin-spawn snowflake drone headgear, plus structural changes (#16935)
* Drones spawn with undroppable chameleon helmets

With a random apperance, for SURPRISES.

* Given drones regenerate_icons() proc

This legacy proc is still used by chameleon items, so drones
get one as well.

* Added drone chameleonmasks that can be toggled

Toggle your custom headgear between hat or mask, be the talk of the town.

* RIP default drone camogear

* Moved drone camoheadgear toggle to the item itself

Now we don't need to worry about clogging up the verbs.

* Added drone camo headgear icons

Thanks Nienhaus so much for spriting these.

* Drone camogear now has customised toggle button

As a side effect of this change, I've made a way of overriding the
normal icon behaviour for item related action datums. If you set
an icon state, it'll behave like a regular action datum, and use
that icon.

* Removed unneeded proc call

* Added 'random' icon to actions.dmi

I borrowed the 'slots1' icon from icons/obj/economy.dmi

* Button to randomise drone camogear apperance

That's THREE GUI BUTTONS for the price of one.

* Made "snowflake" drones; start with drone camogear

* Snowflake drone shell dispensers

(Obviously.)
2016-04-18 11:11:10 -04:00
PKPenguin321 866f63d2d4 makes sec gloves way more obvious
1. makes krav maga gloves pathed under black gloves for fire resistance
2. adds sprites for krav maga gloves to hands.dmi and gloves.dmi
3. sets up a var to prevent krav gloves from being cut into fingerless gloves in color.dm
4. makes sec use the new path for krav gloves in security.dm
2016-04-17 21:06:26 -07:00
PKPenguin321 7501ddebf9 krav update
1. actually adds icons that i forgot to commit to actions.dmi
2. makes leg sweep only do weaken(2) in krav_maga.dm, also adds a /sec subtype of krav maga gloves with a more obvious name
3. makes sec start with the /sec gloves in security.dm
4. makes the krav maga implant a toggle instead of giving you krav maga and deleting itself in implant_krav_maga.dm
5. adds my self to admins.txt
2016-04-17 20:15:42 -07:00
Joan Lung 6c16bc874a Merge pull request #16843 from PKPenguin321/krow-macaw
Adds Krav Maga
2016-04-17 00:02:48 -04:00
PKPenguin321 a8d2dfa182 removes experimental tag 2016-04-16 20:31:29 -07:00
PKPenguin321 ac3e7e18dd final style changes 2016-04-16 20:30:18 -07:00
PKPenguin321 bbf696c625 prevents krav maga from being used while incapacitated 2016-04-16 20:01:53 -07:00
PKPenguin321 3dd20078ae big update
removes all counter/blocking related code and the related sound effect
makes krav maga use action buttons instead of verbs
renamed quick choke to lung punch
reduced stun time on leg sweep
removed head elbow, removed the help button (obsoleted by tooltips)
2016-04-15 17:32:05 -07:00
PKPenguin321 2ecb556e94 addresses minor feedback, fixes implant
krav maga implant now works 100%
trailing returns and a useless if() removed
2016-04-14 22:49:29 -07:00
PKPenguin321 c86e390caf adds krav maga 2016-04-12 18:30:14 -07:00
Incoming 6ec39db02a Ruins are now unique, you won't find two of the same one in the same round.
The configurable portion of ruin selection is now a blacklist instead of a whitelist.

Moves Lavaland files to be consistent with Space files.

All ruins are now valid for the sake of template generation (previously lava ones were but space ones weren't.
2016-04-12 17:13:41 -04:00
Cheridan 09db47c94e Merge pull request #16637 from LanCartwright/virosymptomwork
fixes ancient tier bug where stealth 3 advanced viruses were visible …
2016-04-05 23:50:53 -05:00
MrStonedOne 5098a3c884 Made more sleeps use stoplag
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
2016-04-05 11:08:28 -07:00
Akke e98f0acc27 fixes ancient tier bug where stealth 3 advanced viruses were visible on PANDEMIC. 2016-04-04 23:55:58 +01:00