Commit Graph

153 Commits

Author SHA1 Message Date
Yoshax f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius 98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
SinTwo b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Neerti a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Kelenius acc78a8000 Changes types of ghosts and eyes
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Zuhayr 3239ed23b5 Numerous small Teshari fixes. 2016-02-07 17:16:59 +10:30
Neerti 110593be86 Fixes intercom bug
Fixes #718
2016-01-02 14:03:06 -05:00
Zuhayr 6e8368ac4c Rewrote targeting. 2015-12-16 10:26:40 +10:30
Zuhayr 0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
woodratt e24745b002 -1.3.3.-
- Strategical headsets added to the merc outpost.
- Cargo Bowman headset sprites added. Added to cargo lockers.
- Cargo Technicians lockers have a 25% chance of spawning dufflebags
- ERT bowman headsets added to ERT area.
- Doors added to ERT area.
2015-12-13 23:40:07 -08:00
PsiOmegaDelta 443a376848 Ghosts can now view any object with a NanoUI interface.
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
2015-12-07 02:35:33 -05:00
woodratt 1104407ffc Woodrat, Intercoms and rollerbed tweaks
- Departmental intercoms should have
2015-12-04 17:12:57 -08:00
Neerti 3ebd27eece Forgot to commit this. 2015-11-22 22:03:50 -05:00
PsiOmegaDelta d709363ff7 Radio NanoUI.
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
2015-11-22 21:42:54 -05:00
PsiOmegaDelta 3eae0d5101 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-11-22 21:42:27 -05:00
PsiOmegaDelta 2200bfe436 Map tweaks.
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-11-22 21:41:41 -05:00
PsiOmega 5047ea8267 Observers can now view radio settings, admins can alter them.
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
2015-11-22 21:40:59 -05:00
PsiOmega 5bf7158c9d Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
Conflicts:
	html/changelogs/PsiOmegaDelta-Radio.yml
2015-11-22 21:37:21 -05:00
PsiOmega 1bd40cf8aa Makes the cyborg radio menu more consistent. 2015-11-22 21:36:18 -05:00
PsiOmega 42342bedcb Rotates and otherwise cleans up map intercom usage.
Conflicts:
	code/controllers/communications.dm
2015-11-22 21:35:36 -05:00
PsiOmega 92afc566bb Makes it possible to select department channels on intercoms.
Conflicts:
	code/game/objects/items/devices/radio/intercom.dm
	code/game/objects/items/devices/radio/radio.dm
2015-11-22 21:34:13 -05:00
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta 0c3b6c01e2 Radio NanoUI.
Ports the radio NanoUI interface from Paradise with some Bay-adjustments.
Based on the latest revision https://github.com/ParadiseSS13/Paradise/pull/2369.
2015-10-16 16:01:36 +02:00
Neerti 24d9545790 Headset/shield issues. 2015-10-11 00:54:01 -04:00
Mark9013100 fb1134a24b Changes several helmets, fixes shields
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/modules/clothing/head/helmet.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2015-10-11 00:39:38 -04:00
PsiOmegaDelta 9dd1a54191 Destroy tweaks.
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
2015-09-25 10:44:23 +02:00
PsiOmegaDelta 7d975aa36f Map tweaks.
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058.
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-09-20 17:59:57 +02:00
Chinsky 2563821832 Merge pull request #10972 from Zuhayr/resomi
Adds the Resomi.
2015-09-06 13:09:34 +03:00
PsiOmega 93a8a3a13f Observers can now view radio settings, admins can alter them. 2015-09-04 10:07:41 +02:00
Zuhayr a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
PsiOmega e5aa095f09 Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 2015-09-03 09:38:15 +02:00
PsiOmega 52eae80d74 Makes the cyborg radio menu more consistent. 2015-09-03 08:41:02 +02:00
PsiOmega 13780eba09 Rotates and otherwise cleans up map intercom usage. 2015-09-02 14:26:59 +02:00
PsiOmega c730a67d79 Makes it possible to select department channels on intercoms. 2015-09-02 10:38:16 +02:00
PsiOmega e1aa20fda5 Radio changes.
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
2015-08-29 17:12:48 +02:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmegaDelta 55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/setup.dm
2015-08-17 09:37:49 +02:00
PsiOmega 21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
PsiOmega e4f6436a85 Fixes #10494.
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
SomeoneElse 8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta 3e266ab377 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-05 09:25:53 +02:00
PsiOmegaDelta 6b01a67c50 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
2015-08-05 09:16:50 +02:00
GinjaNinja32 595b58197d fix pAI radios not working 2015-08-05 00:49:28 +01:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30