Commit Graph

237 Commits

Author SHA1 Message Date
c0 1dea7ac78b Defines 2016-03-02 00:23:50 +03:00
tkdrg 29ffc7ef16 Merge pull request #15213 from xxalpha/future
Kinetic accelerators automatically reload.
2016-02-20 09:06:51 -03:00
xxalpha d0d708fa69 spawns 2016-02-17 14:37:07 +00:00
KorPhaeron aea7134ab3 Fixes instagib EMP act 2016-02-08 13:56:05 -06:00
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
Incoming b7ecdf6a2f Adds scatter lasers to the drop list
Changes it so scatter lasers start in scatter mode to drive home the point

CODING STANDARDS
2015-12-28 20:47:32 -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
Remie Richards fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
MMMiracles 2d94b0ff9b feedback changes:
added more loot
nerfed the spawn rates and health of the spawners
widened the paths of some areas for lava passages
added a medbay area to the first level incase of stupid people not coming prepared
added 2 mining rigsuits, may be difficult to get though
fixed(?) issues with dicklys drilling ladders and basalt floors causing issues
2015-11-25 23:24:42 -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 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
2015-11-18 19:55:06 -05:00
bgobandit 47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
YotaXP 2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
KorPhaeron 520fedd2cf Changed a few gun names 2015-10-22 18:52:40 +02:00
Razharas 1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
Xhuis 5f99b313cc Radiation changes 2015-09-26 13:33:27 -04: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 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha 655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
Jordie0608 1d9c61702d Merge branch 'master' of https://github.com/tgstation/-tg-station into bagsofholdingsarejustincompletesingularitygrenades
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
2015-09-21 17:00:08 +10:00
Swag McYolosteinen 1a5df1d08b Merge pull request #11846 from GunHog/RadsPlzKThxLol
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02: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
GunHog 2b7bebb523 Advanced Energy Gun fixes
- AE gun can once again be researched more easily by forcing it to
critically fail.
- Fixed reliability rating being able to become negative.
2015-09-17 10:29:03 -05:00
bgobandit 0664cffa45 tweaks shit 2015-09-15 21:43:19 -04:00
Jordie0608 f8e836ade4 moves update_icon 2015-09-14 23:30:52 +10:00
Jordie0608 d15a4cff5a rework of adv egun failure mechanic 2015-09-14 23:03:41 +10:00
Jordie 15e50de0fe Merge pull request #11694 from bear1ake/point-zero
Remove a bunch of useless .0 in vars
2015-09-13 21:47:09 +10:00
Jordie f02589180d Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem
Added a taser function back to the Advanced Energy Gun
2015-09-13 21:42:45 +10:00
GunHog 34b5dbf5e7 Buffs AE Gun
- Gives Advanced Energy Gun a taser mode.
- Allows them to accept Seclites.
2015-09-10 11:27:30 -05:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09: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 1daaf6f713 fixes action button and m1991 icon 2015-07-23 17:13: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
Cheridan 7aba70ecf3 DRAGnet lives! 2015-06-15 23:55:28 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02: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