Commit Graph

271 Commits

Author SHA1 Message Date
phil235
8a4f8a4482 Revert "Adds 15-force edaggers that look and function like pens when off." 2015-08-16 00:36:08 +02:00
Miauw
37dc7e0e3c Adds 15-force edaggers that look and function like pens when off. 2015-08-14 14:07:10 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ikarrus
6cc17a6243 Resolved Conflicts:
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Ikarrus
3d5f126779 Destructible Clothing [WIP]
- Clothes can be set on fire and extinguished
  - Any item can technically be set on fire and extinguished now, but only clothes (and paper) actually burn right now
  - All of a mob's clothing are burned if the mob is husked by fire
- Clothes will also have a chance of being shredded if you are caught in a bomb blast
  - The bigger the explosion, the higher the chance they have of being destroyed
  - Outer layer clothing (headgear and exosuits) take the shock first, which absorbs some of the shock for the clothes it covers, according to it's bomb armor
2015-06-25 00:06:47 -06:00
phil235
3c6607ad19 Fixes sleepy pen having enough morphine to trigger the overdose message, making it not stealthy. morphine amount reduced from 30 to 20u. 2015-06-25 00:30:09 +02:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Ikarrus
3b326a973b Additional Changes 2015-06-22 22:29:51 -06:00
Ikarrus
8eba1d09bf Gang Update: Recruitment Edition 2015-06-21 00:04:36 -06:00
Cheridan
470f21a752 Merge pull request #10004 from Ikarrus/gangimplants
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
xxalpha
ab103b54dc Righted some checks.
If newcolor
2015-06-17 21:03:11 +01:00
Cheridan
6b6ffe0314 Merge pull request #9972 from Dorsisdwarf/sudoku
Adds a suicide_act to pens
2015-06-16 13:39:37 -05:00
Ikarrus
210cc17d5c Loyalty Implants and Gang Mode
Security treating gangs like revs has had a very negative impact on the experience of gang rounds. With an easy and convenient deconversion method, gangs are easily stomped as they rapidly run out of members to convert. So I'm going to try something different and see how things go if implants in gang mode acted as they are in cult.

- Implants can still prevent conversion, but can no longer deconvert or identify gangsters
- If a recruitment pen fails, the error message the gang boss receives will distinct loyalty implanted individuals from enemy gangsters.
2015-06-15 21:39:21 -06:00
Dorsisdwarf
1b84fccf72 Adds sudukdudu pens 2015-06-15 13:41:31 +01:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Ikarrus
d59c67ecd0 Squashed commit:
[c9795d3] Writing and formatting tweaks

[65aae64] Tweaks to messages and notices, formatting, and cleanup. (+2 squashed commit)

Squashed commit:

[995a61b] I guess I should call them for what they are (9mm)

[0f04213]   - tweak: "While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control."
  - tweak: "Tommy guns no longer deal stamina damage."

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time)
2015-06-13 22:13:01 -06:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Ikarrus
c7ce2cef0e Gang Tweaks
Some tweaks after getting some play tests done.

- Recruitment cooldown increased to 2 minutes
- Gangsters in game modes outside of Gang War cannot recall the shuttle
2015-06-12 21:27:25 -06:00
Razharas
0e28326097 Merge pull request #9779 from Cheridan/touching_linda
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
Cheridan
9e65cdeb6a Merge pull request #9391 from Ikarrus/gangmessaging
Gang-Wide Messages
2015-06-05 22:01:54 -05:00
Ikarrus
ed46350f42 Pens now have a flat cooldown rate of 60 seconds 2015-06-05 19:57:22 -06:00
Cheridan
6c12887367 Pressure_resistance Tweaks
-Adjusts pressure resistance, which determines how easily things can get pushed around by atmos.
-Most items (handheld stuff) are less resistant, while most larger items (mobs, structures, machinery) are more resistant.
-Removes the cooldown on air pushing stuff, which should make it feel more 'responsive', as opposed to the current push->pause->push->pause effect it does now.
-MAGBOOTS/NOSLIPS NOW PREVENT SPACEWIND PUSHING! !!!
-Adds a little wooshy breeze sound to when you would get pushed
2015-06-03 23:22:25 -05:00
Cheridan
12fcb957c0 Merge pull request #9725 from MrStonedOne/patch-15
Fixes paper burning causing lag
2015-06-02 23:34:54 -05:00
MrStonedOne
f4b4b34088 Prevents paper from burning multiple times 2015-05-31 11:37:23 -07:00
MrStonedOne
74ae1eca4d Fixes paper burning from causing lag
By sleeping here, it froze the master controller for 7 seconds, at that point every subsystem would rapid fire to make up for the miss ticks.
2015-05-31 11:30:08 -07:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Razharas
e13e6e8601 Merge pull request #9665 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
Bugfix the anti-ninth
2015-05-29 15:21:51 +03:00
Cheridan
10f2b7ae00 Merge pull request #9559 from xxalpha/cardtrick
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
Jordie0608
e82c02744e paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon 2015-05-27 16:54:13 +10:00
phil235
ec6e318343 Fixes extinguisher (w/safety off) spraying water when placed on a table.
Fixes runtime when putting beaker in autolathe.
Fixes spray can empty message appearing when placing it on a table.
Fixes experimentor manual not having a title.
Fixes runtime with engine goggles updating nearby objects visibility.
Fixes runtime when looking at picture from the AI camera.
Updating the 'can_be_placed_into' list for items so their afterattack don't do anything when placing them in experimentor, autolathe, destructive analyzer.
Fixes soap starting to clean the table when placed on it.
Fixes drinking glasses having capitalized names.
2015-05-23 16:03:48 +02:00
xxalpha
adccdd38e9 Made a proc and fixed other buggy items. 2015-05-19 00:28:15 +01:00
xxalpha
dca4fbbefd Fixed storages contents not updating in some cases. 2015-05-18 23:40:14 +01:00
phil235
be1708483e - Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
kingofkosmos
761d31cea0 More visible.message span classes removed. 2015-04-24 21:24:21 +03:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Ikarrus
2343579a48 - Increased pen cost to 60, mostly so you can't be buying one every 5 minutes late round
- Increased pen cooldown to (15*Gang size)+45 seconds
- Promotion cost now counts how many times you bought that item instead of how many bosses you have, so you can't stockpile on cheap gangtools before promoting anyone
2015-04-22 08:08:13 -06:00
Ikarrus
9c10cec883 Gang mode changelog and minute tweaks
- Gang mode changelog
- Recruitment doesn't cause an obvious seizure any more
- Removed reduced usage on territory spraycans
- Spraycans will notify you if the area you are spraying at is not a valid one for tagging
2015-04-20 08:31:19 -06:00
Ikarrus
4ff044dc78 Gang v3 has been tested and is now good to go! 2015-04-19 22:26:15 -06:00
Ikarrus
af7131c7ad Gang Update v3
The coding isn't done yet, but the design is. So comment on the design while I smooth out the code.

tldr; Gang mode rewrite to follow my original vision: Slower and longer rounds with less deathmatching, and a resource both teams have to fight over

NEW OBJECTIVE: CLAIM HALF THE STATION AS TERRITORY
- Gang bosses can spawn special spray cans that can be used to tag areas
- Any gang member can tag areas.
- Gang tags must be removed before another one is placed in the same area
- Game mode no longer automatically ends when the boss dies. It now ends when either the station evacs, or one gang claims more than 50% of the station areas
- Boss can promote gangers into his lieutenants, which basically means adding more bosses
- Lieutenants can do anything bosses can except promote others to lieutenant

NEW RECRUITMENT TOOL: PENS
- Recruitment pens replace flashes
- Looks exactly like a pen. Stab people to recruit them.
- Recruitment is silent but obvious to the perceptive (Causes a brief seizure)
- Cooldown between uses that gets longer as the gang gets larger

NEW TOOL: GANGTOOL
- Replaces the recaller device. Can still recall the shuttle.
- Provides overview information about the gang (membership size, income amount and time)
- Can spawn pistols and ammo
- Can spawn additional recruitment pens
- Can spawn additional gangtools (For personal use, or promoting a single ganger to lieutenant)

NEW CURRENCY SYSTEM: NAME IS WIP
- Gangtools purchase items with new currency with the placeholder name "Supply Points (SP)"
- Supply points are collected every 5 minutes. The more territory a gang has claimed, the more points they get.
- Supply points are accumulated per-gang. Having more gangtools does not intrinsically give you more points to use.
2015-04-19 01:00:17 -06:00
MrPerson
ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00
MrPerson
9910cf3fe3 Change holidays into datums
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them. Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools, christmas, halloween, new years, and easter, all last at least a week. The idea is so people can celebrate christmas in game without having to, you know, actually play on fucking christmas. And also to put a time limit on how long stuff like the annoying spookoween closet skeletons will stick around so it doesn't overstay its welcome and become annoying as shit like last year.
The event SS now allows more than 1 holiday to run at a time. This matters for new years + christmas, easter + april fools, easter + 4/20, and any holiday that can happen on friday the 13th. The events get stored in a list that's only initialized if there's an active holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040. The current batch run out in 2017.
2015-03-25 01:46:29 -07:00
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
Conflicts:
	code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
Cheridan
12f5f6ae20 Merge pull request #8290 from Ahammer18/droneassfinal
Drone asses!
2015-03-13 13:57:43 -05:00