Commit Graph

2342 Commits

Author SHA1 Message Date
MMMiracles
5f3b31d0a5 bullet 2015-12-19 12:56:37 -05:00
KorPhaeron
225aac7b75 Gun 2015-12-19 07:54:53 -06:00
KorPhaeron
e9903e086d Accelerator Rounds 2015-12-19 07:15:21 -06:00
MMMiracles
ef2ac1b0c8 CONflicts 2015-12-18 16:34:06 -05:00
AnturK
510d1acd06 Medbeam Fixes 2015-12-18 10:03:38 +01:00
MMMiracles
6c2731b22b conflicts are dumb tbh 2015-12-17 21:17:06 -05:00
MMMiracles
ba5bc90d75 just gonna not 2015-12-17 21:11:06 -05:00
MMMiracles
68edcb4c2b Merge branch '1handed' of https://github.com/MMMiracles/-tg-station into 1handed 2015-12-17 21:08:52 -05:00
KorPhaeron
df74fae945 Penetrator rounds 2015-12-17 02:05:34 -06:00
Cheridan
4f647f1693 Merge pull request #13684 from MMMiracles/idedplsnerf
Gives ranged syndicate mobs no-stamina variant bullets (i died please nerf)
2015-12-16 23:40:03 -06:00
MMMiracles
4540c4e06f typepath fixes 2015-12-16 21:18:20 -05:00
MMMiracles
cbc9904c4c saw balance 2015-12-16 20:23:03 -05:00
MMMiracles
cc7ac6c518 exo grip is rip, final changes. 2015-12-16 20:14:23 -05:00
Jordie
3889099444 relase > release 2015-12-16 21:49:17 +11:00
Jordie
2f457588ef Merge pull request #13573 from AnturK/medgun
Adds Med Beam Gun
2015-12-16 21:48:10 +11:00
MMMiracles
b548de38cd gives syndicate ranged mobs non-stamina giving versions of bullets 2015-12-15 21:53:55 -05:00
MMMiracles
7145fd6cf2 incen shots, attempt at some sort of exo-grip attachment please help 2015-12-14 23:37:18 -05:00
MMMiracles
72af408f19 see-saw 2015-12-14 18:28:52 -05:00
MMMiracles
6aac2874ac good 2015-12-13 23:05:46 -05:00
Remie Richards
c1cf3c42b0 Added sniper rifle sprites, and ammo mag sprites, Added 50 AP to standard sniper rounds, allows sniper to be worn on back. 2015-12-13 19:39:05 +00:00
Cheridan
dff14aa0f9 Merge pull request #13563 from RemieRichards/snipper_wiffle
Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink.
2015-12-12 23:55:55 -06:00
Cheridan
0979b72d29 Merge pull request #13554 from bgobandit/banditfixyourshit
More mining fixes and tweaks.
2015-12-12 18:18:18 -06:00
Remie Richards
36d2f54c69 Zooming is now a /gun level ability, enable-able at gun creation via a "zoomable" var, Zooming can be properly enabled externally by calling the build_zooming() proc on any gun. 2015-12-12 15:26:17 +00:00
AnturK
ec85d5ceec Fixes beam crossing
Adds Medbeam gun to Nukeop Uplink
Adds Medbeam gun to ERT medic equipment
2015-12-12 12:26:37 +01:00
Remie Richards
a49fdc0cc7 Allows the sniper rifle to be suppressed and unsuppressed. 2015-12-11 15:22:47 +00:00
Remie Richards
3b1afe46f2 Reallows Noscopes, Losing the weapon/Being stunned/Dying correctly unzooms you. 2015-12-11 15:10:09 +00:00
AnturK
f333562223 Adds Med Beam Gun 2015-12-11 12:01:28 +01:00
Jordie
d7e7ef9280 Update energy.dm 2015-12-11 16:25:16 +11: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
Remie Richards
bc561789c2 Adds a sniper rifle and 3 ammo types to the Nuclear Operative uplink. 2015-12-11 01:30:14 +00:00
bgobandit
01dd491390 Fixes various mining bugs. Adjusts gear costs. 2015-12-10 14:43:33 -05:00
Razharas
3c0100cbf1 Merge pull request #13291 from GunHog/Nanotrasen_Science_Handheld_Clown_Removal_Device
The Bluespace Wormhole Projector now teleports mobs!
2015-11-30 18:18:22 +03:00
Cheridan
76b71469ea Merge pull request #13308 from swankcookie/autorifle_fix
Changes ammo type in autorifle desc
2015-11-29 23:30:14 -06:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
swankcookie
225ce9e555 what do i look like? spellcheck? 2015-11-29 02:27:05 -06:00
swankcookie
fe35576c63 changes round type in desc 2015-11-29 00:15:37 -06:00
GunHog
09844e6f48 NSHCRD
- The Bluespace Wormhole Projector will now teleport mobs hit by the
projectile!
2015-11-28 16:41:51 -06:00
Remie Richards
fdede51a09 Merge pull request #12954 from MMMiracles/spookycaves
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
Cheridan
762568255d Merge pull request #13102 from bgobandit/newmininggear
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06: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
Aranclanos
0f1945bef6 Merge pull request #13051 from kingofkosmos/enableidtopdaonfloor
ID into PDA without PDA in your inventory and a few other similar things
2015-11-23 20:27:07 -03:00
Jordie0608
9198120ee8 unifies energy gun self charging 2015-11-22 17:37:26 +11:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Razharas
52ce383102 Merge pull request #13053 from AnturK/doors
Makes staff of doors create random mineral doors.
2015-11-20 06:54:28 +03:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof
Adds subtypesof(path)
2015-11-19 16:31:09 -06: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
kingofkosmos
50b55e54e8 Removes checks for seclite/hydrid taser + suppressor/gun to be in hands for combining them. 2015-11-18 06:24:23 +02:00