Commit Graph

1013 Commits

Author SHA1 Message Date
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
skull132
507869d848 Sorts out two-handed ballistic weapons in their entirety:
* All automatic rifles need two hands for improved performance
* Shotguns need 2 hands to be racked
* AM rifle needs two hands to look down scope, and for improved accuracy
2015-09-20 22:34:53 +03:00
skull132
c70d8d31fe Base code for handling any two-handed firearm. 2015-09-20 22:32:47 +03:00
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
PsiOmegaDelta
7bcf9aaea9 Merge pull request #10340 from comma/russian_roulette
Russian roulette and russian roulette accessories
2015-09-03 19:40:01 +02:00
Chinsky
28cf860332 Adds revolver spin sound. 2015-09-01 12:18:49 +03:00
PsiOmega
e48fbdd1e6 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate
Conflicts:
	code/modules/clothing/clothing.dm
2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
PsiOmega
d001489d14 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen
Adds armor penetration system
2015-08-22 02:22:17 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
PsiOmegaDelta
5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
mwerezak
77ddae4e26 Structures now take damage properly from projectile clouds 2015-08-15 19:08:45 -04:00
mwerezak
8b08f8ff34 Fixes explosions deleting projectiles 2015-08-15 02:51:02 -04:00
mwerezak
4092b40ae5 Updates frag grenades to use bresenham, tweaks 2015-08-15 02:41:32 -04:00
HarpyEagle
6404d02c38 Adds changelog and tweaks PTR penetration. 2015-08-15 02:19:23 -04:00
mwerezak
da58494275 Improves the way shrapnel clouds hit prone mobs 2015-08-14 00:25:41 -04:00
Chinsky
822d48928b Fixes caps getting stuck in air forever.
Also apparently just being nodamage 0 damage non-sharp bullet is not enough to stop suicide from working -_-.
2015-08-14 06:19:35 +03:00
Chinsky
b01a41d766 Merge branch 'capgun' into russian_roulette 2015-08-14 06:03:33 +03:00
Chinsky
b4ec03b871 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into russian_roulette 2015-08-14 05:57:00 +03:00
Chinsky
328621b860 Moved cap guns to proper guns. 2015-08-14 05:51:29 +03:00
HarpyEagle
2e8f927085 More descriptive variable name
Renames armorpen to armor_penetration
2015-08-13 22:38:28 -04:00
mwerezak
0cf21df8b5 Adjusts projectile values 2015-08-13 22:37:47 -04:00
Chinsky
94f0ceffe1 Merge pull request #10200 from mwerezak/gun-desc
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00