2229 Commits
Author SHA1 Message Date
PsiOmegaDelta 665776f400 Merge pull request #11570 from Raptor1628/dev
Security Gear II
2015-12-03 21:22:34 +01: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 a6517e86b1 Total rewrite of awful fireaxe cabinets. 2015-12-02 22:49:47 +10:30
Atlantis 89f5c9f405 Fixes #11540 2015-12-02 11:27:28 +01:00
Zuhayr 9dfe54d514 Added a click delay to interactions with the fire axe cabinet. 2015-12-02 20:28:18 +10:30
PsiOmegaDelta 11e47bc8c2 Fixes being unable to emag secure closets.
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
2015-12-02 08:30:47 +01:00
Zuhayr 9a3038a85c Generalized pulling restrictions to mob level. 2015-12-01 21:23:35 +10:30
Zuhayr f2a7536807 Mops can now be wet in buckets or sinks. 2015-12-01 02:05:27 +10:30
Kearel 5cc2944733 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-11-28 11:21:07 -06:00
PsiOmegaDelta 4e89045aab Merge pull request #11451 from Loganbacca/wireless
Wireless controller for machinery connections
2015-11-27 07:59:59 +01:00
PsiOmegaDelta f74d9e6862 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
	maps/exodus-1.dmm
2015-11-22 11:48:00 +01:00
PsiOmegaDelta 26f167453c Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-22 11:40:44 +01:00
Loganbacca 56bf894ee1 Wireless button updates
Added toggle variants for buttons, allowing them to "deactivate" connected devices.
Converted flashers and holosigns.
Fixes to keep in line with upstream.
2015-11-22 22:32:52 +13:00
Loganbacca 750414e280 GC cleanup
Cleaned up some GC code and properly implemented it for wireless datums
Remote buttons are now fully working with emitters and crematoriums
2015-11-22 22:32:52 +13:00
Loganbacca a9555b0175 Converted emitter remote control
Also converted crematoriums, although they are not working at the moment.
Removed redundant wireless manager file.
2015-11-22 22:32:51 +13:00
Zuhayr 9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
Bjorn Neergaard ef1f91e334 Fix Laptop Vendors and Personal Lockers not accepting ID Containers
Fixes #11092
2015-11-22 00:27:03 -06:00
Kearel a8406f018b Adds Entertainment Items
Adds the following:
Actor Guild for ghosts to spawn at.
Board for playing board games.
Two trading card games with booster packs.
Tarot cards.
Cargo can now supply lasertag equipment as well as decks/booster packs
2015-11-12 23:24:34 -06:00
Chinsky ba3c1f03d7 Merge pull request #11195 from Hubblenaut/dev
CtrlClick deflates inflatables
2015-11-02 00:11:14 +03:00
Chinsky 1417f4f40b Merge pull request #11344 from Hubblenaut/tape
Tape - Sprites and Algorithm Changes
2015-11-02 00:10:03 +03:00
Chinsky 4ae1a45017 Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows
Crescent windows are now near indestructible.
2015-11-02 00:08:52 +03:00
PsiOmegaDelta a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry
Adds laundry basket
2015-10-31 11:16:14 +01:00
PsiOmegaDelta 7c7ed0f3fc Crescent windows are now indestructible. 2015-10-28 09:25:12 +01:00
Zuhayr 1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
Hubblenaut ef591fa2b3 Atmos personal locker spawn with atmos tape roll 2015-10-22 14:31:07 +02: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 13b175c529 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	code/game/objects/effects/aliens.dm
	code/game/objects/structures/lamarr_cage.dm
2015-10-10 12:05:36 +02:00
Hubblenaut ba19c28c33 Adds laundry basket 2015-10-09 17:03:41 +02:00
PsiOmegaDelta 55c9f7533b Alien eggs now include follow and spawn links. The alien larvae plant seed check now uses the specific type instead of a name. 2015-10-07 08:56:13 +02: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
Kelenius 83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
Hubblenaut 8f7d108831 Ctrl+Click deflates inflatables 2015-10-04 15:56:45 +02:00
PsiOmegaDelta a3a1f495a3 Implements my own comment suggestions and updates Travis' macro count. 2015-10-01 09:56:30 +02:00
PsiOmegaDelta 8eee143177 Merge remote-tracking branch 'upstream/dev' into xenomorphs
Conflicts:
	baystation12.dme
2015-10-01 09:48:51 +02:00
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
Joseph Heinemeyer 9e9df0a15d Delete ladders.dm 2015-09-26 17:43:52 -07:00
Hubblenaut f0481b551e Fixes grab-buckling overwriting pixelshift 2015-09-26 14:11:01 +02:00
PsiOmega 38c0251b6d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-21 17:35:49 +02:00
PsiOmega 5b4c7340e4 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-21 17:26:19 +02:00
Zuhayr a985e036f0 Minor cleanup. 2015-09-21 20:43:53 +09:30
Zuhayr bfe1d5a599 Span classes. 2015-09-21 20:36:51 +09:30
Zuhayr 22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30
PsiOmegaDelta d891fba1cc Mob size tweaks.
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
Hubblenaut 4eef7ab65d Fixes beds occasionally buckling in odd directions 2015-09-19 15:27:24 +02:00
PsiOmega 5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega 5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
mwerezak db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
PsiOmegaDelta bb5680193f Converts some loc = to forceMove()
Fixes #11102.
2015-09-14 11:13:15 +02:00
PsiOmega 0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
2015-09-13 10:52:01 +02:00