1485 Commits
Author SHA1 Message Date
Lord Lag ee583b913d Vaurca Update
Vaurca for ne code, now with better sprites
2016-01-20 19:50:19 +00:00
Mahzel d5e2689336 MagLock integration 2016-01-13 22:57:13 +01:00
PsiOmegaDelta 5a4a240e43 Merge remote-tracking branch 'upstream/dev' into 160111-Tele
Conflicts:
	baystation12.dme
2016-01-13 12:10:57 +01:00
PsiOmegaDelta dcfe907ff0 Makes it possible to convert uplink TCs into physical form.
These crystals can be inserted into active uplinks, making it possible to trade them.
Variant of https://github.com/ParadiseSS13/Paradise/pull/3174/files.

The uplink now always shows the description to avoid annoying button shifting.
2016-01-11 16:58:42 +01:00
PsiOmegaDelta a83e78a648 Merge remote-tracking branch 'upstream/dev' into 160102-Yona
Conflicts:
	code/modules/modular_computers/file_system/programs/ntnrc_client.dm
2016-01-08 19:02:30 +01:00
Chinsky bc390c5603 Fixes #11914 2016-01-07 05:49:16 +03:00
ZuhayrandPsiOmegaDelta 5ec489aef5 Added a colour selector to the floor painter, added the floor painter to the construction and drone modules.
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2016-01-02 12:23:30 +01:00
Ccomp5950 7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
Atlantis 605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
PsiOmegaDelta a4545f8ded Scheduler, observation, and New() tweaks.
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
2015-12-27 17:44:53 +01:00
PsiOmegaDelta 8ce1b47943 Using the multitool on equipment now adds a set of fingerprints. 2015-12-23 13:33:52 +01:00
PsiOmegaDelta f6eec096e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-20 11:55:53 +01:00
PsiOmegaDelta 5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
Spamcat f2ac9a023b pAIs no longer see custom emotes twice.
fuck i spent way too much time on a single line fix
2015-12-16 19:36:14 +03:00
Chinsky 8413d7bd20 Merge pull request #11682 from Zuhayr/guns
Targeting rewrite.
2015-12-16 08:40:21 +03:00
Zuhayr 1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
Zuhayr 2da40e525e Removed targeting. 2015-12-16 10:09:20 +10:30
PsiOmegaDelta 1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01:00
PsiOmegaDelta 7d7aa4b50b Turns events into vars instead of a list, to greatly simplify qdel() cleanup. 2015-12-14 13:44:05 +01:00
PsiOmegaDelta 6b5d237c46 The hacking tool item can now be bought through the Antag Uplink. 2015-12-14 09:56:55 +01:00
Chinsky 36803747a2 Merge pull request #11445 from Kearel/fluff2
[FEATURES] Adds entertainment items
2015-12-12 16:49:01 +03:00
PsiOmegaDelta f74bd5e1d9 Observer fixups.
Adds a proper proc for raising events.
Now only creates the observer lists when an object registers itself.
Multitools now unregister themselves properly from buffers on Destroy().
2015-12-12 12:06:05 +01:00
Kearel 9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
Kearel 7b2b658644 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-07 11:43:51 -06:00
PsiOmegaDelta 2402b3ccd8 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-07 17:56:27 +01:00
PsiOmegaDelta 0db775938d Re-rotates radio icons.
Little to see here.
2015-12-07 15:19:42 +01:00
PsiOmegaDelta 12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/nano/nanoui.dm
2015-12-06 12:10:33 +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
PsiOmegaDelta 39f0fcebaa Extension additions and multitool menu tweaks.
Relocates obj extension code to the extension file.
Adds a support method, set_extension, to ensure that proper cleanup occurs in the case of multiple additions to the same extension type.
The default multitool menu title is now much shorter.
The cloning computer multitool menu now lists all connected cloning pods.
2015-12-05 22:51:41 +01:00
Kearel caa0fbaea5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-05 12:47:03 -06:00
PsiOmegaDelta 416c24f3e2 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-04 11:20:39 +01:00
Zuhayr 7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
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 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
Zuhayr 7f2ec91e54 Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak
Uplink cost tweaking.
2015-12-02 09:56:07 +10:30
Kearel 5cc2944733 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-11-28 11:21:07 -06:00
PsiOmegaDelta e9d8e89725 The multitool now properly releases its buffer reference when the buffer is destroyed. 2015-11-23 09:39:38 +01:00
PsiOmegaDelta 50fb4a8de7 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/game/objects/items/devices/multitool.dm
2015-11-23 08:57:12 +01:00
PsiOmegaDelta 11db663fac 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-11-22 12:21:41 +01:00
PsiOmegaDelta 8a4250ddcd Can now connect cryo pods and computers with each other using the new multitool methodology.
Also cleans up Destroys().
2015-11-17 22:58:10 +01:00
PsiOmegaDelta 6370705c02 Multitool menu.
Begins work on allowing the multitool to modify and alter more equipment than ever.
2015-11-17 19:42:41 +01:00
PsiOmegaDelta 3d0417d622 Corrects and adds more sanity checking. 2015-11-15 14:45:36 +01:00
PsiOmegaDelta ad7c08fe4f Uplink cost tweaking.
Default starting telecrystal amount more than doubled.
Mercenaries are now explicitly given 4 times the default telecrystal amount.
Syndicate toolbox now includes insulated gloves instead of cables.

General item cost tweak.
2015-11-15 10:59:50 +01:00
PsiOmegaDelta 7484385e0d Adds hacking tool.
In normal mode a hacking tool acts and functions just like any multitool. Use a screwdriver to toggle between normal and hacking mode.
Hacking attempts will take 20 +(0 to 20) seconds (triangular distribution, averages at +10 seconds).
Once an airlock has been successfully hacked the user will have full access to the door operation interface normally restricted to silicons.

A hacking tool will remember the last 6 to 8 hacked airlocks.  No time is needed to again hack remembered airlocks.
Once the limit has been reached the least recently accessed airlock is forgotten. Hacking a remembered airlock will update the last accessed time.

Also adds a basic observer/listener pattern implementation to, for example, make it easier to catch when objects have been destroyed and clear references.
2015-11-13 21:59:56 +01:00
Kearel 3e6ebd5d1a Fixes tags for real this time 2015-11-13 00:02:09 -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
PsiOmegaDelta 7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01: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
PsiOmegaDelta 299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00