Commit Graph

206 Commits

Author SHA1 Message Date
xxalpha
acddd54b36 Kinetic accelerators automatically reload. 2016-02-05 08:02:59 +00:00
MMMiracles
64b09f82e5 outlining on rifle is more defined, made a red and blue variant along with a generic variant. 2016-02-02 18:19:22 -05:00
MMMiracles
ea3e03ec48 adds a blue variant of the rifle for team-based stuff or something 2016-01-30 01:57:14 -05:00
MMMiracles
cb8e000580 adds instagib rifle 2016-01-30 01:24:56 -05:00
Cheridan
0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
Jordie0608
7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
2015-12-11 15:59:46 +11:00
bgobandit
01dd491390 Fixes various mining bugs. Adjusts gear costs. 2015-12-10 14:43:33 -05:00
bgobandit
f435f18d6b fixed gunhog's shit, added new KA/res to asteroid rooms, added mesons to mech scanner 2015-11-24 07:18:54 -05:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
Jordie0608
9198120ee8 unifies energy gun self charging 2015-11-22 17:37:26 +11:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
c0
a687b07eac f u c k c o n f l i c t s 2015-09-25 14:35:44 +03:00
xxalpha
655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Remie Richards
82a79a1705 Merge pull request #11787 from bgobandit/theywanttherandd
Adds origin tech values to a lot of items.
2015-09-19 14:20:09 +01:00
bgobandit
0664cffa45 tweaks shit 2015-09-15 21:43:19 -04:00
Firecage
42a28af718 Updated gun names. 2015-09-07 10:06:14 +02:00
duncathan
51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Jordie0608
64ebc1f1af icon reversions 2015-07-23 18:46:01 +10:00
Jordie0608
e985aa05d3 Merge branch 'master' of https://github.com/tgstation/-tg-station into thisalsomeansammoleftcannowbecalculatedasafactorofoverlayslength
Conflicts:
	code/modules/projectiles/guns/energy/temperature.dm
2015-07-16 21:02:50 +10:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Jordie0608
9c0ef0c2ce overlays for energy guns 2015-07-15 19:06:48 +10: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
7df5998740 Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma. 2015-04-08 03:44:56 +02:00
phil235
d0e9a5c0c9 Nerfs the kinetic accelerator.
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
ACCount12
1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
pudl
0964979a90 bitch says she wanna keep her throat warm 2015-03-26 21:16:25 -05:00
pudl
69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Fayrik
0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
paprka
7a8e78a4c3 this kills the object verbs 2015-02-25 00:19:53 -08:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
phil235
dcf99380b6 Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos
Introducing the Ion Carbine!
2015-02-18 00:16:33 +01:00
GunHog
9d7b7a34ae Fixes my merge error. 2015-02-17 14:47:26 -06:00
Cheridan
15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
phil235
135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
Cheridan
14c9abaaee Merge pull request #7539 from Iamgoofball/kinetic
Ports the kinetic accelerator changes from NT
2015-02-13 17:56:03 -06:00
GunHog
0b0737b292 Merge remote-tracking branch 'remotes/origin/master' into IonCarbinesFor-k-ommandos
Conflicts:
	icons/mob/belt.dmi
	icons/obj/guns/energy.dmi
2015-02-12 09:08:31 -06:00
Remie Richards
6613851028 Merge pull request #7593 from Cheridan/pin_fix
Pin fixes, additions
2015-02-12 06:43:11 +00:00
GunHog
5786626c87 Introducing the Ion Carbine!
- Adds the Ion Carbine, a compact version of the Ion Rifle that users
can carry on their belt or in a regular backpack.
- Adds the Ion Carbine to R&D, replacing the Ion Rifle.
- Ion Rifle now starts with a pin installed as it can no longer be made
in Science.
- The Ion Rifle and Ion Carbine can now accept Seclites as an
attachment.
2015-02-10 18:03:30 -06:00
Swag McYolosteinen
e5e8b27790 Merge pull request #7491 from paprka/simplyepicbuff
Removes range from ebow bolts + price revert + bugfix
2015-02-10 17:15:44 +01:00
Cheridan
3da8f70e4d fixes #7608 2015-02-07 20:48:50 -06:00
Steelpoint
ea3bb2e80b Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler
Conflicts:
	code/modules/research/designs/mechfabricator_designs.dm
2015-02-06 13:19:15 +08:00
Iamgoofball
791381394c Ports the kinetic accelerator changes from NT 2015-02-03 21:19:30 -08:00
paprka
53a1590a9e fixes ebow sound when reloading 2015-02-03 14:48:04 -08:00
paprka
8173cd2460 fixes pulse rifles not being emp proof apparently 2015-02-01 23:27:56 -08:00
Steelpoint
4262a1c89c WrongDescription 2015-01-27 20:37:00 +08:00
Steelpoint
f279e0754b MisplacedLine 2015-01-27 17:47:25 +08:00
Steelpoint
8b78853c68 Tweaking 2015-01-27 17:43:13 +08:00
Steelpoint
359514e239 SecBorgDisabler 2015-01-27 17:24:13 +08:00
paprka
d96c9c2fdd fixes borg lmg 2015-01-23 02:57:52 -08:00
Swag McYolosteinen
b44956df86 Merge pull request #7191 from paprka/ebowfix
fixes ebow and KA breaking once emp'd
2015-01-22 18:04:08 +01:00