Commit Graph

55 Commits

Author SHA1 Message Date
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
octareenroon91 c183c660fc Typo in four-color pen feedback
Change message starting, "pen will now write..."
Now it starts grammatically correct: "The pen will now..."
2015-11-18 16:36:42 -06:00
octareenroon91 5b429cf2fe remove commented-out code from pen.dm
fine
2015-11-17 18:43:40 -06:00
octareenroon91 33350bffe6 Four-color pen code improvement.
Take advantage of inheritance; use defaults instead of New()
2015-11-17 13:07:22 -06:00
octareenroon91 4a5cda8a8b Introduce the four-color pen
Add a fancy pen that lets you choose between black, red, green, and blue ink.
2015-11-16 20:14:30 -06:00
AndrewJacksonThe2nd 2d307e330e makes sleepypens refillable 2015-11-02 17:41:35 -08:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09: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
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
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
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
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
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
Ikarrus ed46350f42 Pens now have a flat cooldown rate of 60 seconds 2015-06-05 19:57:22 -06: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
Mandurrrh fa0fa08171 Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units. 2015-02-22 12:14:14 -05:00
Iamgoofball b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Miauw 7c97447d24 Balance changes to the sleepypen. 2014-09-05 18:24:25 +02:00
Firecage dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
paprka 3bf4ecfba5 fixes laziness 2014-07-18 18:30:23 -07:00
Miauw 4eb83ed546 Oh, not in cruelty, not in wrath
The Reaper came that day;
An angel visited this damned sat,
  And took the parapen away.

Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.

Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
2014-07-12 17:48:33 +02:00
Hornygranny 2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Razharas 358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Giacomand 4b4735fb22 Made changes based on feedback.
The pen/hypo/borghypo doesn't give a poke message when it fails to inject someone wearing protective gear.
Fixed a typo.
Reworded the can_inject() error message for humans so it makes sense with a normal pen.
Made the combat hypo (nuke ops item) ignore protective gear, to allow syndies to heal their comrades.
2013-12-13 22:51:44 +00:00
Giacomand 130803fcd9 * Added the THICKMATERIAL flag. It is used for thick coverall suits (space suits, firesuits, etc) and it will stop injections from syringes, hypos and parapens. It is also used for head items such as biohoods and space helmets. If you aim for the head, it will check if you can inject through the head equipped item, if you aim anywhere else it will check the external suit.
Let me know if I missed an item or if you don't think an item should have the flag.

* Cleaned up a bit of the gun code.
* Fixed an issue with shotgun darts not working in barrel shotguns.
* Made the on_hit() have a zone, will be used for syringe guns in another PR.
* Removed the unused sleepy pen.
* Changed /obj/item/weapon/gun/projectile/shotgun/pump/sc_pump to /obj/item/weapon/gun/projectile/shotgun/sc_pump, there was no /pump/ anywhere else.
* Shotgun darts will follow the new flag.
* Shotgun darts are now open containers, and I removed the snowflake check for them in syringes.
* Added logging for reagents in any projectile.
2013-12-13 00:00:20 +00:00
Pete Goodfellow e4bce0bb14 Replaced most reagent initialisations with the helper proc create_reagents(). 2013-04-15 15:40:33 +01:00
giacomand@gmail.com 3dabcc8df6 - Fixed the memory leak for effects, which have reagents.
- Fixed a bug with C4 not causing an explosion around a target, which is a mob.
 - Fixed not being able to put para/sleepy pens on your ear.
 - Added a delete proc for reagents (the container) which will garbage collect it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5772 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-24 14:25:01 +00:00
petethegoat@gmail.com 03dd030b77 Updated the paperwork module, mostly just to tidy things up.
Fixes issue 1267. Empty paper bins icon not updating
Fixes the paperbin MouseDrop(), so you can actually pick them up again.

Removed /obj/item/weapon/paper/flag and /obj/item/weapon/paper/photograph. Both were unused.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5733 316c924e-a436-60f5-8080-3fe189b3f50e
2013-02-18 17:34:09 +00:00
baloh.matevz@gmail.com 5bb06b184c - Added a killswitch to the master controller for air processing and pipe processing, accessible through two toggle-verbs in debug verbs.
- Added a verb that breaks all airgroups into individually processing tiles and a verb that forces a group-rejoin attempt on all airgroups. Once the verb to break all air groups is used, they will not attempt to recreate until the recreate verb is used. In other words, this is for debugging, not goofing around. Verbs available in debug verbs.
- Some atmos code standardization
- Decreased the pressure resistance of most items by a factor of 10, meaning pressure will finally actually move items around!

I also attempted to speed up air movement, but it caused runtimes and everything moved in checkered patterns and I got scared so I didn't include it in this commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5554 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-15 07:12:32 +00:00
elly1989@rocketmail.com d0e0ec56da Added Xmas trees to the canteen and chapel.
Added Xmas and Xmas Eve holiday-features:
>If ALLOW_HOLIDAYS is in config.txt, random (harmless) wrapped presents will be placed under all xmas trees on z-level 1. :3
>Ian will start wearing a santahat
Added content for the end of the Mayan Calander.
Fixed the spelling of -invisible- pens



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5226 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 14:07:41 +00:00
petethegoat@gmail.com c4f9b43020 Moved para and sleepy pen defines out of weapon.dm.
Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!

A few other things which aren't worth listing individually.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-13 14:37:28 +00:00
johnsonmt88@gmail.com 28aabc9810 More file structure stuff!
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.

There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.

Next up: Finish the files in the weapon folder, then start moving defines down.


My god I hope I havent broken everything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 03:32:58 +00:00
ericgfwong@hotmail.com 3939599047 Fixed item_state for red and blue pens
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4181 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-26 04:49:15 +00:00