Commit Graph

13212 Commits

Author SHA1 Message Date
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
Atlantis
7e39ef1a38 Hardware rework
- Hardware pieces are now items, rather than datums.
- Adds deconstruction for computers. Empty tablet/laptop/console frames may be wrenched to break them back into metal sheets. You have to empty the frame first, by using screwdriver to take out components one by one.
- Components may be moved between devices. You can for example take your tablet, remove it's hard drive, and slot it into a console. It will have all the files it had on your tablet.
- Not all hardware can be fitted into all devices. Tablet can't hold 2K GQ cluster hard drive, for example.
- Hardware may be fabricated by research for relatively low costs, once you have relevant research levels. Obtaining computer this way is much cheaper than buying it at the vendor.
- Data crystals added (glorified USB flash sticks) that allow file transfer to different devices. File browser program updated accordingly to support importing/exporting of files to these crystals.
- Battery module added.  These are wrappers for actual power cell object and act as limit for cell size, otherwise it would be possible to have 30k cells inside devices, which would allow them to run insanely long.
2015-12-02 10:32:49 +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
PsiOmegaDelta
89d20b9195 Updates macro/span use. 2015-12-02 09:25:00 +01:00
PsiOmegaDelta
c30a518221 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-02 09:18:07 +01:00
PsiOmegaDelta
2560c13816 Fixes hemostat surgery.
Port of https://github.com/PolarisSS13/Polaris/pull/381.
2015-12-02 08:56:58 +01:00
Zuhayr
7ff77f5079 Removes a leftover world << 2015-12-02 18:21:09 +10:30
Zuhayr
f89edb8e80 Fixes drop pods activating each other's doors. 2015-12-02 18:15:59 +10:30
Zuhayr
a90c2ca077 Runtime fixes.
(cherry picked from commit 0cf0b726608ca07ae456441355b399095f21dffc)
2015-12-02 08:37:09 +01:00
Zuhayr
22ac269692 Emergency fix for HasProximity being passed a turf.
(cherry picked from commit 622fb93a3ec52b4c6fbff1c96ea576a1a24d71ac)
2015-12-02 08:36:41 +01:00
Zuhayr
e83a8adc2c Generalizes the accessory system to work for suits. 2015-12-02 18:04:21 +10:30
GinjaNinja32
8303404678 Merge pull request #11553 from PsiOmegaDelta/151201-RandomLobby
Adds the ability to have random lobby screens.
2015-12-01 23:58:08 +00:00
GinjaNinja32
f9c513a3dd Merge pull request #11552 from PsiOmegaDelta/151201-HoloMovement
The AI can now toggle hologram eye tracking.
2015-12-01 23:57:59 +00:00
Zuhayr
c8b6986b62 Merge pull request #11551 from PsiOmegaDelta/151201-DontTazeMeBro
Renames the rig mounted taser.
2015-12-02 09:59:47 +10:30
Zuhayr
c2a4ee22cf Merge pull request #11316 from atlantiscze/apc-fix
Fixes #11149
2015-12-02 09:57:26 +10:30
Zuhayr
a56618119a Merge pull request #11502 from PsiOmegaDelta/151121-InWorldParams
Replaces 'in world' arguments.
2015-12-02 09:56:28 +10:30
Zuhayr
81a3cfdcb1 Merge pull request #10172 from LightningIron/mecha
Refactor of some mecha functions
2015-12-02 09:55:19 +10:30
PsiOmegaDelta
a32be3f359 Adds the ability to have random lobby screens.
A random lobby screen is now picked at server start, and presented to all players. Sadly in our case we currently only have one every day lobby screen.
Port of https://github.com/PolarisSS13/Polaris/pull/321, with added sanity checking.
2015-12-01 15:55:18 +01:00
Hubblenaut
bf5b206224 Changes to Pushing Mechanics
- Being on help intent will never push a mob/living
 - Mobs on help intent will not swap positions when either are pulling
   something
2015-12-01 14:18:50 +01:00
PsiOmegaDelta
7803da0e11 The AI can now toggle hologram eye tracking.
Allows the AI to use the "Toggle Hologram Movement" verb to toggle whether the hologram should follow the AI eye or not.
Also adds a check to ensure that the holopad can see the hologram, otherwise it shuts down.
Partial port of https://github.com/PolarisSS13/Polaris/pull/11.
2015-12-01 12:18:00 +01:00
Zuhayr
b3d1ed5985 Removing a world that snuck back in after rebase. 2015-12-01 21:41:17 +10:30
Zuhayr
2d3c69157a Rewriting some pull logic. 2015-12-01 21:31:58 +10:30
Zuhayr
9a3038a85c Generalized pulling restrictions to mob level. 2015-12-01 21:23:35 +10:30
Zuhayr
6b2a24841b Holders now pass on their contained mob's ID card. 2015-12-01 21:23:11 +10:30
PsiOmegaDelta
1a293e2d96 Renames the rig mounted taser.
Was previously called an energy gun, which could be mildly confusing.
Port of https://github.com/PolarisSS13/Polaris/pull/127.
2015-12-01 08:48:47 +01:00
PsiOmegaDelta
a7dc586e72 Merge pull request #11549 from Baystation12/dev-freeze
Dev
2015-12-01 08:19:19 +01:00