Commit Graph
2153 Commits
Author SHA1 Message Date
Kearel 9450680b1c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into fluff2 2015-12-10 13:04:52 -06:00
Chinsky 60e785da97 Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
Multitool Upgrade
2015-12-09 21:34:12 +03:00
Chinsky c9542be1ce Merge pull request #11630 from PsiOmegaDelta/151207-RotationalIcons
Rotational icons
2015-12-09 11:08:24 +03:00
PsiOmegaDelta 185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
PsiOmegaDelta 5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
2015-12-08 08:09:37 +01:00
PsiOmegaDelta 78718480d5 Rotational icons.
/icons/obj/policetape.dmi
* Makes the icons gray scale, and cardinally rotational.
2015-12-07 22:50:25 +01: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
Chinsky cbf51f9c73 Merge pull request #11605 from mwerezak/click-cooldown
Adds click cooldowns
2015-12-07 19:56:23 +03:00
Zuhayr c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix
Organ fixes
2015-12-07 19:13:09 +10:30
PsiOmegaDelta d4173355c6 Sparks now qdel() cleanly.
Also takes the opportunity to remove some exces /effect/ pathing.
2015-12-07 09:19:06 +01:00
HarpyEagle 93233b6dd9 Adds soap wetting log message 2015-12-06 14:03:33 -05:00
JonandHarpyEagle c9b7a8ece3 Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.

Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-06 14:01:21 -05: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
mwerezak 9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak 87648e86ef Fixes runtime when cleaning turfs with soap
Partial fix of #11490
2015-12-06 02:00:50 -05:00
mwerezak fa6c8415ea Adds click cooldowns to common healing and repair actions 2015-12-06 00:23:49 -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
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
PsiOmegaDelta 665776f400 Merge pull request #11570 from Raptor1628/dev
Security Gear II
2015-12-03 21:22:34 +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
mwerezak ffa34bea0b Merge pull request #11563 from PsiOmegaDelta/151202-LessListingMoreObserving
Syndicate id cards now listen for owner destruction.
2015-12-02 12:29:45 -05:00
PsiOmegaDelta 3f01c250f9 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower 2015-12-02 15:39:46 +01:00
PsiOmegaDelta 0f46590b35 Syndicate id card now checks if the player mind an antag.
Instead of the player mob itself.
Fixes https://github.com/PolarisSS13/Polaris/issues/389.
2015-12-02 13:45:59 +01:00
PsiOmegaDelta 003819cd89 Syndicate id cards now listen for owner destruction.
This instead of keeping a list that every mob loops over when they are destroyed, to ensure the reference is removed.
2015-12-02 11:05:41 +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 11e47bc8c2 Fixes being unable to emag secure closets.
And ensures that this costs an emag charge.
Also corrects emag_act calls. Partial port of https://github.com/PolarisSS13/Polaris/pull/377.
2015-12-02 08:30:47 +01:00
Zuhayr 7f2ec91e54 Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak
Uplink cost tweaking.
2015-12-02 09:56:07 +10:30
Zuhayr 81a3cfdcb1 Merge pull request #10172 from LightningIron/mecha
Refactor of some mecha functions
2015-12-02 09:55:19 +10:30
Zuhayr 0b8125d30b Added boot knives and putting a knife in your boot. 2015-12-01 02:05:29 +10:30
Zuhayr 084d99e566 Allowed lighters to be put into cigarette packets. 2015-12-01 02:05:28 +10:30
Zuhayr 3e38598244 You can now pull your punches when engaging in unarmed combat. 2015-12-01 02:04:39 +10:30
Zuhayr e2ce3fbb08 Duct tape can now be used to gag, blindfold or cuff people, and cable cuffs/duct tape can restrain rig-wearing people (poorly). 2015-12-01 02:04:10 +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 79016f6d44 It is now possible to use a multitool to configure alert console circuits, and the available alarm sources. 2015-11-21 15:10:29 +01:00
Zuhayr 70c692a337 Oxygen tanks now have a visual indicator of their pressure on the item icon. 2015-11-20 19:36:33 +10:30
Zuhayr 09e4749a9c Bats can now be slung over your back. 2015-11-20 19:36:27 +10:30
RavingManiac b405c575cf Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2015-11-19 14:45:30 +08: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 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
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 19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta 694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
Chinsky 1417f4f40b Merge pull request #11344 from Hubblenaut/tape
Tape - Sprites and Algorithm Changes
2015-11-02 00:10:03 +03:00
PsiOmegaDelta a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry
Adds laundry basket
2015-10-31 11:16:14 +01:00