Commit Graph

13294 Commits

Author SHA1 Message Date
mwerezak
24688cd28a Fixes switching firemodes not generating any messages 2015-12-06 01:45:15 -05:00
GinjaNinja32
bf236b9cbd Merge pull request #11596 from Loganbacca/mapupdate
Wireless framework cleanup - buttons
2015-12-06 06:13:38 +00:00
mwerezak
9b118df8a5 Fixes #11477 2015-12-06 00:46:24 -05:00
mwerezak
fa6c8415ea Adds click cooldowns to common healing and repair actions 2015-12-06 00:23:49 -05:00
mwerezak
e4b95d6e8d Adds missing click cooldowns for aggressive actions
Fixes #11601
2015-12-06 00:05:06 -05:00
mwerezak
a7d80a93e5 Fixes mismatching diona internal organ tags 2015-12-05 23:39:16 -05:00
mwerezak
b12e094112 Removes unreachable return in organ/external/remove(), smaller embedded items are no longer deleted. Implants changed to w_class 1 because seriously a w_class 3 implant makes no sense at all. 2015-12-05 23:38:57 -05:00
Loganbacca
b27d256602 More wireless fixes
- Removed need for additional sender datum for mass drivers and doors
 - Updated mass driver sequence for new door receivers
2015-12-06 16:50:48 +13:00
mwerezak
92b47c94de Makes organ/externa/attack_self() control flow easier to follow, handles embeded non-items 2015-12-05 19:19:39 -05:00
mwerezak
a5411f26c5 Fixes runtime when moving with missing legs or feet 2015-12-05 18:10:39 -05:00
GinjaNinja32
19b24452db Merge pull request #11443 from Hubblenaut/dev
Changes to Mob Bump Mechanics
2015-12-05 19:01:56 +00:00
GinjaNinja32
92a1f1a016 Merge pull request #11590 from PsiOmegaDelta/151204-SaveMyCharacter
Can now load/save/reload while readied.
2015-12-05 18:59:19 +00:00
GinjaNinja32
9c76f1dfb4 Merge pull request #11547 from Kearel/alcatrazSynth
Adds Alcatraz Icons for Borgs
2015-12-05 18:57:52 +00:00
mwerezak
46568e7ee0 Merge pull request #11600 from GinjaNinja32/spinning
add verbs to allow players to spin their view
2015-12-05 13:52:40 -05:00
Kearel
caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06:00
Kearel
45c2f54998 Change name from alcatraz to eyebot 2015-12-05 12:42:11 -06:00
PsiOmegaDelta
5c8516e2b7 Transfers language shortcut keys from per character setting to a global one. 2015-12-05 13:01:51 +01:00
PsiOmegaDelta
fefa400604 Changes the character setup update flow.
Changes the way savefile version upgrades are done, letting each sub-setting handle it own upgrade path, while also making it easier to transfer settings between preferences and individual characters save slots.
2015-12-05 12:03:34 +01:00
Loganbacca
8c0bcd74d2 More wireless cleanuping
- Split airlock initialize and fixed parent calls
 - Added more door button functionality
2015-12-05 23:43:46 +13:00
GinjaNinja32
7ce8f42e11 add verbs to allow players to spin their view 2015-12-05 10:42:00 +00:00
GinjaNinja32
58dda1e96d fix autohiss for fully-capitalised strings 2015-12-05 06:53:26 +00:00
Zuhayr
834f86241a Alters an unEquip() conditional in Give(). 2015-12-05 00:49:35 +10:30
PsiOmegaDelta
9b6b5ad4b3 Can now load/save/reload while readied.
The load window also no longer pops under the character setup screen.
Just some small character preference QoL changes.
2015-12-04 11:43:25 +01:00
PsiOmegaDelta
94b999772b Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/station_alert.dm
2015-12-04 11:22:27 +01:00
PsiOmegaDelta
416c24f3e2 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-04 11:20:39 +01:00
PsiOmegaDelta
6ceb3906ca Implements a reasonable /hide() default. 2015-12-04 11:15:44 +01:00
PsiOmegaDelta
37c5e316c0 Additional fixes.
Fixes terminals not hiding under floors.
Makes power sensors hide under floors correctly, the layering trick evidently didn't work.
2015-12-04 10:23:28 +01:00
Merchoven
0fbc298616 Fix for disposal pipes not vanishing under floors.
This is a fix for issue #291. Disposals pipes should now properly stop
displaying when a floor is placed on top of them.
2015-12-04 09:58:08 +01:00
Chinsky
f22fd16b79 Merge pull request #11512 from PsiOmegaDelta/151123-HelmetCamToggle
Changes space helmet camera toggling to a verb
2015-12-04 11:29:38 +03:00
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze
Bunch of IPC fixes.
2015-12-04 11:28:25 +03:00
Chinsky
5df915b638 Merge pull request #11534 from PsiOmegaDelta/151129-GeneralTasks
Adds a process for general tasks
2015-12-04 11:26:00 +03:00
Chinsky
939c9deacc Merge pull request #11577 from PsiOmegaDelta/151203-RemoteState
Adds a remote interaction state for NanoUI.
2015-12-04 11:20:39 +03:00
Zuhayr
398541f4eb Amendments. 2015-12-04 18:14:40 +10:30
Zuhayr
0cf5a709d1 Refactored give(). 2015-12-04 17:58:53 +10:30
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Zuhayr
fd59c3ad76 More tweaks to IPC fixes. 2015-12-03 22:56:19 -08:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
Zuhayr
cc8b37562a Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into drones2 2015-12-04 16:53:44 +10:30
GinjaNinja32
7779cd218a Merge pull request #11578 from PsiOmegaDelta/151203-RestrainedIncapacitation
Makes it possible to ignore some incapacitation checks.
2015-12-04 05:14:16 +00:00
PsiOmegaDelta
cc72f82371 Backports NanoUI fixes from dev.
Fixes #11579.
2015-12-03 21:50:24 +01:00
PsiOmegaDelta
665776f400 Merge pull request #11570 from Raptor1628/dev
Security Gear II
2015-12-03 21:22:34 +01:00
PsiOmegaDelta
fa9321fca1 Merge pull request #11558 from Zuhayr/dev
Generalizes the accessory system to work for suits.
2015-12-03 20:08:56 +01:00
Zuhayr
14c39c6ba4 Merge pull request #11559 from PsiOmegaDelta/151202-InfraredFix
Fixes proximity sensors being passed turfs/areas
2015-12-04 04:16:31 +10:30
PsiOmegaDelta
ff15635aef Makes it possible to ignore some incapacitation checks.
This fixes  #11576. Also corrects the viewers() usage in visible_message.
2015-12-03 12:52:38 +01:00
PsiOmegaDelta
448e743308 Merge remote-tracking branch 'upstream/dev' into 151129-GeneralTasks
Conflicts:
	code/game/machinery/computer/atmos_alert.dm
2015-12-03 10:18:39 +01:00
PsiOmegaDelta
ad67887706 Adds a remote interaction state for NanoUI.
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.

Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.
2015-12-03 10:15:11 +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
PsiOmegaDelta
3f01c250f9 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-02 15:39:46 +01:00
Zuhayr
617bb99195 Reverted an unEquip>drop_from_inventory line in rig.dm. 2015-12-03 00:54:50 +10:30
Atlantis
c7e7c05a34 Fixes #11546 2015-12-02 11:14:41 +01:00