Commit Graph

13006 Commits

Author SHA1 Message Date
Atlantis
0e78d9b51c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into inflatables-squashed 2015-12-07 13:55:48 +01:00
Atlantis
e493fe0134 Robot inflatables v2
- Re-opened version of #9274 with few minor adjustments and reduced commit amount.

- Creates new device - Inflatables Dispenser(ID) that can be used to deploy/undeploy inflatables
- IDs are added to Engineering, Construction and Crisis robot modules
- Three IDs replace three boxes of inflatables in engineering storage.
- Re-adjusted weights of inflatables. IDs and boxes may now fit in backpacks, deflated inflatables may fit into pocket.
2015-12-07 13:52:51 +01:00
PsiOmegaDelta
ac3f159125 Incapacitation. 2015-12-06 11:53:46 +01:00
PsiOmegaDelta
62f7ddac25 Compilation fixes. 2015-12-06 11:50:08 +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
GinjaNinja32
85bb2778d0 Merge pull request #11610 from mwerezak/suicide-logging
Fixes #11466
2015-12-06 10:23:31 +00:00
mwerezak
2312631508 Fixes #11510
Splashing and external transfer now checks if the container is open
2015-12-06 02:49:46 -05: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
Zuhayr
c4ac5e2bd3 Merge pull request #11606 from mwerezak/firemode-fix
Fixes #11477
2015-12-06 17:51:12 +10:30
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
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
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
45c2f54998 Change name from alcatraz to eyebot 2015-12-05 12:42:11 -06: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
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
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
Zuhayr
4535ab99a5 Rig unEquip() amendments. 2015-12-02 19:51:48 +10:30
Zuhayr
bf186a4a01 Adds a confirmation to user-activated ninja self destruct. 2015-12-02 19:36:45 +10:30
Zuhayr
f63a03363b Fix for a merge error resulting in very wonky hardsuit behavior. 2015-12-02 19:26:54 +10:30
PsiOmegaDelta
39150f5138 Now fetches the user name from the id, if one is worn. 2015-12-02 09:27:57 +01:00