Commit Graph

46 Commits

Author SHA1 Message Date
paprka
726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
Ergovisavi
896414bcc4 Increased cost of gygax, decreased cost of durand, capped protolathe coeff at 2x 2014-04-16 20:09:54 -07:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
Aranclanos
b84d47717d Merge pull request #3191 from Steelpoint/LaserChange
Laser Gun Ammo Buff + Sprite Change for Red Laser Tag
2014-03-31 14:02:21 -03:00
Steelpoint
fd32b3ebda Removes LaserTagLaser Sprite Change + Reduces Laser Gun Ammo 2014-03-31 15:49:08 +08:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Incoming
e5f0165d0d Merge branch 'master' of https://github.com/tgstation/-tg-station into avoiddrama_codemagic
Conflicts:
	code/datums/spells/charge.dm
	code/modules/projectiles/ammunition/special.dm
	code/modules/projectiles/guns/magic/staff.dm
2014-03-26 13:03:12 -04:00
Steelpoint
454ebaeb2b LaserGun Change and Other 2014-03-26 20:55:46 +08:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
Ergovisavi
57fe8ea3f4 Various mineral/material standardizations, minor mob changes 2014-03-19 18:28:56 -07:00
Incoming
5c3f7777b9 Magic Mania 1.5: Big Trouble in Little Boxstation
---

A Few New Wizard Items

Staff of Chaos: Shoots random magic bolts. Charges faster and can hold more shots than other staves.
Staff of Door Creation: Works the same as the wand of door creation. There is apparently demand for this! Charges faster and can hold more shots than other staves.
Wand Assortment: A belt that comes of one of each useful wand, generated with the highest number of shots possible.

---

Cleaning Up the Spellbook

The spellbook was getting REALLY long, so it's been segmented into pages for spells, items, and one time use spells (aka the fun page). The spellbook also highlights the fact that you can upgrade spells better now.

---

Summon Magic Rebalancing

There's now a new catagory of magic items that are especially potent. These have a very low chance of showing up now and only one can spawn during a casting of summon magic, if one even spawns at all. The person who gets it is not guarenteed to be a surivor either.

In this category: Staff of Animation, Staff of Change, Staff of Chaos, Wand Assortment, Contract of Apprenticeship.

Additionally the staff of door creation is now in the normal pool and the staff of change is no longer in the normal pool.

---

Misc Stuff

Adds Bats and Goats to the staff of change.
Changes the charge spell so if you charge something that can charge on its own there's no chance of degradation.
2014-03-08 17:30:40 -05:00
Ergovisavi
062f368ce0 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss 2014-03-07 04:24:51 -08:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
Ergovisavi
ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
TZK13
9e79d2e4b4 Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites. 2014-02-26 12:05:41 -06:00
hornygranny
3e07065631 mag name fixed 2014-01-31 16:22:49 -08:00
hornygranny
c569654ebc Mobster items + shirt 2014-01-31 15:50:09 -08:00
Ergovisavi
eb8924d80c Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc 2014-01-20 17:36:06 -08:00
Cheridan
8aaf10feb4 Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets
Gun Revamp 2: Gun Harder: Director's Cut
2014-01-14 11:10:05 -08:00
Hornygranny
775728e20e Beanbag damage lowered. .38 damage increased. 2014-01-13 11:08:19 -08:00
sirbayer
e09660906a Unless it's spontaneously generated more problems, we done here. 2014-01-07 14:32:28 -08:00
sirbayer
efb480005d Syringe guns can suck it. 2014-01-02 16:18:48 -08:00
sirbayer
f4542ee258 Scattershot ho! 2013-12-30 20:43:10 -08:00
sirbayer
a0a73d1ab5 Jesus Christ it compiles 2013-12-30 16:30:36 -08: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
sirbayer
19e51caef0 Modification of .gitignore to include admins.txt. Hopefully.`
Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Modification of .gitignore to include admins.txt. Hopefully.`

Added myself to admins.txt for testing.

Merge branch 'srsbsns'

Fucking finally figuring out how to make admins.txt be ignored.

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

stuff

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge branch 'master' of https://github.com/tgstation/-tg-station

latest setting for tgstation.dme

deeply do I loathe these files

Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt

God I hate gitignore

Merge branch 'master' of https://github.com/tgstation/-tg-station

Merge remote-tracking branch 'remotes/origin/srsbsns-improvedprojectiles' into srsbsns-improvedprojectiles

Conflicts:
	config/admins.txt
	data/investigate/singulo.html

I don't what I'm doing

Massive overhaul to automatic gun functionality, intended primarily to
allow partially-filled magazines to be released.

Now it compiles and doesn't throw runtimes! Also chambering rounds works
right! Unfortunately the contents still need to be looked at, the Russian
Revolver isn't working, and the Bartender's shotgun is just a nightmare.
Also you still can't eject mags.

Mags eject, most gun work. Shotguns still have a problem with reloading
and chambering. Russian Revolver is a bitch.

Heavy finalizing touches. Fixed references to changed trees. Added
icon_states for some magazines. Fixed revolver glitches and subtyped
double-barreled shotguns to revolvers to fix its glitches. Made bullets
and spent shells more obvious via graphical changes. Probably did some
other things but I can't think of what they'd be.

Sprite tweaks for final preparations for pull request.

final FINAL finalizations.

Adding full paths to overwritten procs for simplicity's sake.

Fixing damaged .gitignore and config/admins.txt.

Finalization for pull preparation. Clean up some descs, eliminate data folder.
2013-10-30 17:56:00 -07:00
ACCount12
556d6b5800 Desc update 2013-09-14 16:20:26 +13:00
ACCount12
7d2e590233 Update bullets.dm 2013-09-06 14:44:54 -07:00
ACCount12
fcc96919ff Update bullets.dm 2013-09-06 14:39:10 -07:00
Robson Richards
e1b1c3c6b0 Commits Buff, Stechkin AGAIN 2013-08-29 20:50:32 +01:00
petethegoat@gmail.com
adae991ef5 Alien runtimes fixes from Cael.
Added a new syndicate bundle option, the smooth operator. Includes a pistol, silencer, clean up gear, and the ever essential suit and new formal shoes, with sprites by Flashkirby.
Currently the shoes are only used by smooth operators, but I'm gonna ask Ikarrus to put some on the latest map when he's done with it.

Changed the 9mm casing to use midbullet2, as weakbullet is just pathetic.

Removed /obj/item/weapon/glass, on account of it being awful and unused.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5543 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-13 22:08:16 +00:00
petethegoat@gmail.com
dde9d121a2 Fixes issue 1154. Slime Jam Not Appearing
Nerfed the janicart ricochet chance a bit.

Removed the coolness check from the det revolver.
Removed the det revolver from the map, and made it spawn in his locker.
You can now modify the det revolver to fire .357 with a screwdriver.
Fixed the det revolver having one round too many. S&W Model 10 only has six shots.

Updated some guncode, mostly just adding proper text styles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5297 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-11 22:01:25 +00:00
petethegoat@gmail.com
c6b8a3b009 Fixed some L6 issues.
Added a pistol that can be silenced for future nuke op use.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5138 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 18:57:14 +00:00
petethegoat@gmail.com
ee66c32bd0 Updated the L6.
Fixes issue 1095. L6 Icons bugged after reload

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5089 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 18:52:41 +00:00
Kortgstation@gmail.com
ab4c92e066 Using summon guns gives a message to the the user to confirm it working.
Added a new borg upgrade module which requires illegal tech and combat tech to make. It allows you to give them their emagged equipment without fucking with their laws.

New LMG by Ausops (both sprites and code). Right now appears only in Summon Guns, but may appear elsewhere in time.

Grilles now have a bullet act, so they no longer magically absorb infinite bullets.

Updated changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5037 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-11 07:43:49 +00:00
Kortgstation@gmail.com
abb7be68ea Gyropistol now uses magazines.
New Gyropistol and Gyropistol magazine sprites by Ausops.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4602 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 19:44:06 +00:00
kortgstation@gmail.com
3c4400c8f9 Fixed Erro's NON COMPILING CODE regarding flashlights
Made it so simple_animals with destroyer can smash tables 

Reverted the detectives ammo to nonlethal

Deathsquad now spawns with loyalty implants by Deuryn's request (for IMMERSION)

Fixed a bit of border being left on the red boxing glove sprites

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3159 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-21 01:28:53 +00:00
kortgstation@gmail.com
b80e5db0cb Emergency fix because I'm retarded and typed "/obj/projectile/bullet" as "/obj/projectile/bullet/bullet"
I'll work on the balancing/reverting of the guns later, this is just so it stops causing runtimes



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3134 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-16 22:58:15 +00:00
kortgstation@gmail.com
3a96667003 Desert Eagles now use magazines, .50AE ammo, and only have 7 shots. They're basically revolvers that use magazines.
Nuke ops lost that horribly nerfed piece of shit c20r and now get Desert Eagles and Riot Shields.

The detectives .38 ammo now does the same damage as regular revolver bullets. If he wants to keep acting as a glorified sec officer, he can go grab a taser.

The Veil Render now summons a subtype of Nar-Sie which doesn't pull anchored objects. This should reduce the power of the item/reduce lag while I get sprites and finalize details with Urist for reworking it as the Sphere of Annihilation (as in, this is temporary)

Updated the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3132 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-16 07:20:32 +00:00
mport2004@gmail.com
2f3f4e38eb Fix for blanks not being blanks
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2454 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 11:26:04 +00:00
mport2004@gmail.com
9ca449bf7a New WIP TK system added. To activate your TK click the throw button with an empty hand. This will bring up a tkgrab item. Click on a non-anchored (currently) non mob Object to select it as your "focus". Once a focus is selected so long as you are in range of the focus you can now click somewhere to throw the focus at the target. To quit using TK just drop the tkgrab item.
The captains laser, aegun, and xbow recharge a bit slower now, they recharged so fast that you almost never had to stop shooting. 
Cleaned up the cyborg_modules file
Medical and Security borgs have a hud item.
Medical bots bottles hold 60 of their chemical (up from 30).
Medical bots now have three syringes that are labeled "Syringe-(Inaprovaline)", "Syringe-(Anti-Toxin)",  and "Syringe-(Mixed)".
Medical bots now have two kelotane/dexalin pills (up from 1/ea).
Engineering bots got a new RCD thats just like the old one but the code is cleaner and meant for borgs only.
Husks brains can no longer be cut out.
Healing hands code has been removed till whoever wants to finish it adds it to a place that is NOT the base click procs.
Added veyveyr's nuke team weapon.  Its more or less the Uzi with a new icon.
Nuke teams also got a bit of extra ammo and a few more pinpointers/eguns in their locker.
Glass doors will not set opacity to 1 after they close.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2431 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-27 08:37:40 +00:00
mport2004@gmail.com
76a584a808 Ammo boxes and such now have a multiple_sprites var that determines if the update_icon proc should actually update the icon.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2426 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-25 13:16:09 +00:00
mport2004@gmail.com
73fa5743e0 Seems I managed to give revolver ammo one extra bullet and as such the it would attempt to set the icon to a nonexistent icon state.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2381 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-17 07:23:33 +00:00
mport2004@gmail.com
67d4ceffb0 Job system should be working now. I had a '==' where a '&' should have been that would cause it to only work when you had one job of the same level and department selected.
The loyalty implant box now spawn in the HoS' locker and not in nullspace.
Gave the HoS' locker a secbelt.
The revolver now use the proper bullet.
Robotics spawn with their labcoat/toolbox.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2346 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-12 23:00:48 +00:00
mport2004@gmail.com
62e28c2abf Organs:
Moved into their own folder and got split into three files.
Damage  zones have been regrouped slightly to make it easier to deal with them. Currently the organ groups are head, l/r leg, l/r arm, and head.

Attacking:
Armor is properly checked.
Currently aiming for the chest gives a higher chance to stun whereas the head will stun for longer.
Stungloves/Disarm now show up in the attack log.
Stungloves ignore intent.

Silicon:
AI units can now move between cams that are not on the ss13 network.
Cyborg's alert screen should not longer pop up every time they get an alert if they have opened it once during the round.
Robot vision now uses the standard amount of energy.

Gamemodes:
Added Deuryn's unrev message.
Runes can only be examined if you are close to them.
Moved the Loyalty implants to the HoS' locker at the request of HerpA.
Nuke agents now come with explosive implants that will activate upon death.

Projectiles:
Once again went though the gun code and cleaned things up, it is much better now.
Bullet_act fixed up and most mobs now use the one in living, just overload it if they need to do something diff.
Freeze /caplaser/xbow no longer have an infinite loop.
Shotguns have to be pumped manually.

Went though the latest runtime log.

Power cells now use return on their give/use procs

Assemblies have been reworked and are nearly finished, just need to finish up the special assembly code, redo the signalers, and add one or two new assembly items.
Laying down will now only take 3 ticks to get up, from 5.

You can no longer punch people on the spawn screen.

This is a big one and was cleared by two heads, TK will only allow you to pick up items.  If you have an item in your hand it will act normal.

This revision got much larger than originally intended my tests show everything is working fine, but you never know.  Ill likely do more mob teaks in the next few days.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2333 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-08 10:38:01 +00:00
mport2004@gmail.com
a72e6d6a84 Projectiles cleaned up a bit and moved into a /modules folder.
Solars should work a bit better now.
Removed the old shield item as it has not been used in forever and was cluttering up some of the mob code.
IonRifle only has 5 shots before it needs to be reloaded down from 10.
Lowered the weakbullet's stun to match the taser.
You can no longer recall the shuttle on meteor.
Fixed a bug I caused on rev where if the revs were in space and dead it would count them as living.
Bit of blob work.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2220 316c924e-a436-60f5-8080-3fe189b3f50e
2011-09-18 07:27:05 +00:00