Commit Graph

1043 Commits

Author SHA1 Message Date
Alberyk
36cacd28a4 Gun update (#387)
This pull adds bolt actions rifles, they are like pump shotguns, with the capacity for 5 7.62mm bullets.
Also adds a 7.62mm clip in the hacked autolathe. Raiders have a chance to spawn with one.
2016-06-23 02:16:57 +03:00
Werner
a424b71a4b Possible fix for highlander
TS Fix

Law Maker Incendiary Fix

Possible Lawgiver burstfire fix

Lawgiver Changes:
Fix Rapid Fire
Add Armor Piercing
Add Pellets

Lawgiver:
Nerf incendiary bullets

Blow up the users weapon arm if his dna doesnt match
Added a proper soundeffect

Added Changelog.
Closes #71, Closes #327

Make the lawgiver emagable and change stun to a beam

Added crowdcontrol mode to the lawgiver

Final Tweaks to the lawgiver

Updated .gitignore to inclode the .atom-build.json

Fixed indentation
Fixed blowing up the wrong hand if the user switch hands after the killswitch has been triggered
2016-05-27 22:28:55 +02:00
Lord Lag
b294a52dcc Fixes 120
replaces the temperature gun with the old-fashioned Freeze ray.
2016-03-20 14:52:11 +00:00
skull132
d42f82ef3d No attack logs for practice lasers 2016-02-21 16:47:07 +02:00
skull132
c462205540 Fixes #148
Reworks the if checks, should make the system more robust.
2016-02-21 15:39:57 +02:00
Ryan784
d576c6683c Gun Accuracy Enhancements Fix #138
Slightly increases the accuracy of guns by +1 (an extra tile, we can
tweak this later).

Shooting at blank range no longer has a chance to miss.
2016-02-14 18:09:45 -05:00
skull132
36dbadc106 Del() -> Qdel() 2016-02-07 14:59:21 +02:00
skull132
b8d5c57d79 Merge pull request #35 from skull132/master
Changelogs & Quick Tweaks
2016-02-01 19:06:36 +02:00
skull132
69e355fe9f Sec Related Tweaks
* Tasers are projectiles once more.
* Handcuffs don't need level 2 grab to work.
2016-02-01 18:59:02 +02:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
skull132
1c167ac363 Merge pull request #11 from skull132/rifles-import
Rifles import
2016-01-28 02:06:32 +02:00
PsiOmegaDelta
6089ccccea Makes events global.
Greatly decreases the number of objects that need to be created (currently 3 event handlers in total vs basically 3 per datum)
The price is a slower lookup of listeners but on a per round basis it should still be much less than the current startup time penalty.
2016-01-26 13:12:37 +01:00
PsiOmegaDelta
dbe608d1d4 Gun aiming status now updates on attacker/target movement.
Also corrects the in-view logic. Now checks if the aimer can see the target, not if the target is within a given radius. Fixes #11926.
Cleans up Destroy() code a bit.
2016-01-23 16:10:14 +01:00
ccomp5950
b15c3e2397 Hostile mobs now use new projectile code.
Kudos to PsiOmegaDelta for pointing it out.
2016-01-19 09:56:04 -05:00
ccomp5950
f6fa18c49d Fixes #5390 2016-01-18 23:45:19 -05:00
Dibasic
729d5b2881 antique laser description typo fix
there wasn't a period this adds a period
2016-01-17 12:20:44 +01:00
Ryan784
92c1ab268c Lawgiver reinstated
Adds back in Lawgiver, the lawgiver lockbox and the ability to create
them in research.
2016-01-14 16:54:26 -05:00
Zuhayr
8da41d6bca Fixes #676 2016-01-14 08:36:06 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
Loganbacca
4fdfc84249 Fixed projectile effect runtime
Only showing the impact effect without the rest of the tracer would look a
bit silly anyway.
2016-01-01 11:28:02 +13:00
Zuhayr
b2a268ba0e Fixed weapon use by borgs. 2015-12-29 14:02:33 +01:00
PsiOmegaDelta
a4545f8ded Scheduler, observation, and New() tweaks.
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
2015-12-27 17:44:53 +01:00
Zuhayr
64421e35ca Fixes some overlay issues with aiming. 2015-12-17 17:39:25 +01:00
Zuhayr
1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
Zuhayr
2da40e525e Removed targeting. 2015-12-16 10:09:20 +10:30
PsiOmegaDelta
12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm
2015-12-13 10:47:33 +01:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
SkyMarshal
d10118e3d0 Fixes #11346
Fixes #8123

Removes adminbus ability to call down the Icarus... because it's pretty broken.
2015-12-12 12:03:15 -07:00
PsiOmegaDelta
d4173355c6 Sparks now qdel() cleanly.
Also takes the opportunity to remove some exces /effect/ pathing.
2015-12-07 09:19:06 +01:00
PsiOmegaDelta
b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev.
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
2015-12-06 11:48:20 +01:00
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
2015-12-06 11:34:36 +01:00
mwerezak
d508893e3c Tweaks pointblank multipliers to play better with droplimb thresholds 2015-12-06 02:44:09 -05:00
mwerezak
29192fd8e8 Fixes #11466 2015-12-06 02:35:18 -05:00
mwerezak
24688cd28a Fixes switching firemodes not generating any messages 2015-12-06 01:45:15 -05:00
mwerezak
9b118df8a5 Fixes #11477 2015-12-06 00:46:24 -05:00
Raptor1628
2cd5a49498 Security Gear II
Collection of Security changes:

New heavy vest sprites, replacing the old toggle system.
New helmet sprites.
Heavy vests reduced to 2 pockets.
Regular vests have no pockets.
Holobadge sprite change and badge addition for HoS/Warden.
Teargas Grenades, replace flashbangs in vendor and officer lockers,
flashbangs located in armory and with warden.
Detective 1911 starts with flash magazine, has one rubber magazine in
locker.
Rubber bullet damage halved to reduce frequency of bone breakage and IB.
Flash bullet buffed to cause small halloss.
Armory loadout changed to static 4 e-guns, 4 laser guns, 2 ion rifles, 2
shotguns starting loaded with beanbags, 4 Mk 58s loaded with flash
rounds.
Tactical armor removed, still available in cargo.
Sub-Armory restored to warden access only, officer access storage rack
added.
Now with Changelog.

Threads and Polls located here:

http://baystation12.net/forums/threads/discussion-poll-security-energy-weapons-antag-projectile-weapons.932/

http://baystation12.net/forums/threads/discussion-poll-detective-weapon.865/
http://baystation12.net/forums/threads/discussion-armory.792/

http://baystation12.net/forums/threads/discussion-security-vest-and-helmet.790/

Quick Fix

	modified:   code/datums/supplypacks.dm
	modified:   code/game/machinery/vending.dm
	modified:   code/game/objects/items/devices/uplink_items.dm
	modified:   code/game/objects/items/weapons/grenades/chem_grenade.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/security.dm
	modified:   code/modules/clothing/suits/armor.dm
	modified:   code/modules/clothing/suits/storage.dm
	modified:   code/modules/clothing/under/accessories/badges.dm
	modified:   code/modules/projectiles/guns/projectile/pistol.dm
	modified:   code/modules/projectiles/projectile/bullets.dm
	modified:   code/modules/projectiles/projectile/energy.dm
	modified:   code/modules/random_map/drop/drop_types.dm
	new file:   html/changelogs/Raptor1628-Dev.yml
	modified:   icons/mob/belt.dmi
	modified:   icons/mob/head.dmi
	modified:   icons/mob/suit.dmi
	modified:   icons/mob/ties.dmi
	modified:   icons/obj/clothing/hats.dmi
	modified:   icons/obj/clothing/suits.dmi
	modified:   icons/obj/clothing/ties.dmi
	modified:   maps/exodus-1.dmm
	modified:   maps/exodus-2.dmm
2015-12-02 13:42:41 -05:00
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
Chinsky
2a88b4d0aa Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision
Overhauls humanoid vision handling.
2015-10-15 19:15:28 +03:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
PsiOmegaDelta
27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
PsiOmegaDelta
070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
2015-10-11 17:17:41 +02:00
HarpyEagle
40ab99b354 Rubber bullets and beanbags now check melee armour instead of bullet armour 2015-10-08 16:36:51 -04:00
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
PsiOmegaDelta
f3175becc0 Overhauls humanoid vision handling.
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
2015-10-05 08:48:47 +02:00
GinjaNinja32
c8eb26326a Merge pull request #11208 from mwerezak/firemode-cleanup
Fixes #10850
2015-09-28 11:41:03 +01:00
mwerezak
13c184c2a8 Fixes #10850 2015-09-27 14:13:37 -04:00
skull132
c1c8ff6259 automatic.dm fix
Makes things look more uniform.
2015-09-21 20:55:01 +03:00
skull132
4751235555 Energy rifles
Creates the /obj/item/weapon/gun/energy/rifle parent, which has a select-fire rifle, two types of laser rifles and a pulse rifle.
Also makes the energy sniper mimick the functionality of the AM rifle.

To do: test and modify the values for rifles, so they are different from their non-rifle counsins.
2015-09-21 20:54:25 +03:00