Commit Graph

287 Commits

Author SHA1 Message Date
kingofkosmos
c8333ac8ca Makes the photocopier look different from the librarian's scanner control interface. 2015-10-20 06:23:10 +03:00
phil235
0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled.
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
2015-10-08 00:48:00 +02:00
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Xhuis
0203c3c8c1 Conflicts 3/3 2015-09-17 20:08:26 -04:00
Xhuis
cca9138bc1 Conflicts 1/3 2015-09-17 20:07:09 -04:00
Xhuis
f13c142837 Newcult update 2015-09-17 17:17:31 -04: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
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Razharas
93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
Razharas
e69d8d312b Merge pull request #11232 from Miauw62/alanedaggerpoe
Edaggers: Actually works edition
2015-09-01 11:07:22 +03:00
bgobandit
4fe28339c5 Makes requested changes. 2015-08-26 18:37:14 -04:00
bgobandit
4909600303 Adds/tweaks several suicide messages. 2015-08-23 15:02:34 -04:00
kingofkosmos
4194d02a5a Made cyborg verbs not work when dead.
Switched comment one line down.
2015-08-22 10:24:50 +03:00
Miauw
f64f1e2967 Reverts the revert properly instead of unreverting it unproperly. 2015-08-16 12:55:09 +02:00
Miauw
e8c39e2d07 Merge branch 'master' of https://github.com/tgstation/-tg-station into alanedaggerpoe
Conflicts:
	code/modules/paperwork/pen.dm
2015-08-16 12:00:04 +02:00
Miauw
efb5226784 ayy lmao i forgot that pens overwrite attack() 2015-08-16 11:54:47 +02:00
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