Commit Graph

3077 Commits

Author SHA1 Message Date
JJRcop
e235bc94e6 Adds new nuke toy, plays nuke sound when attack_self'd
Cooldown of 5 minutes

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/objects/items/toys.dm
	icons/obj/toy.dmi
2014-01-11 12:40:19 -05:00
ZomgPonies
ab8422f5aa More hull resistance tuning 2014-01-11 06:01:30 -05:00
Rob Nelson
5a061d770f Fix #381 - Poster duping 2014-01-10 02:04:20 -05:00
Rob Nelson
2b1e308e31 Fix #384 - Fridges can be opened while welded shut. Also discovered this extended to secure lockers.
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	html/changelog.html
2014-01-10 02:03:51 -05:00
Rob Nelson
ea5784a4aa Fix for #382 - Bombs not deleting themselves and the fridge they're in.
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2014-01-10 02:02:34 -05:00
Rob Nelson
dbe20f8216 Fix for #383 - C4 deleting fridges full of corpses. 2014-01-10 02:01:19 -05:00
Rob Nelson
5b6648a2c9 Fix #384 (possibly): Welding a fridge/freezer does nothing. 2014-01-10 02:00:51 -05:00
Rob Nelson
9fdde1eec7 Fix #388: Incorrect C4 timing checks.
Conflicts:
	code/game/objects/items/weapons/explosives.dm
2014-01-10 01:59:07 -05:00
Rob Nelson
da6b615e44 Adjacent didn't work, back to using get_dist. 2014-01-10 01:56:45 -05:00
SkyMarshal
e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
Conflicts:
	code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
SkyMarshal
d101e5c111 RCDs no longer create plating with air on it.
Fixes #3545
2014-01-09 20:26:28 -05:00
Rob Nelson
9bdae9ff75 Fix fire extinguishers bluespacing their contents afar when dumping.
Also use Adjacent so we can't dump through windows.

Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
2014-01-09 05:09:51 -05:00
Cheridan
2b87fcf581 Upgradeable Laser Pointers!
Laser pointers can be upgraded with laser stock parts, which increases the odds of hitting a target.
Whee!

Conflicts:
	code/game/objects/items/devices/laserpointer.dm
2014-01-09 04:20:08 -05:00
Mloc-Argent
4e7feaf624 More elegant solution to dirt getting in the way.
Who needs to click dirt anyway?

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/decals/Cleanable/misc.dm
2014-01-08 18:40:00 -05:00
YotaXP
b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
Ccomp5950
a6b70bc8b4 PDA NanoUI Optimizations.
Since we no longer have to send data on first UI view we can remove those
checks and only look at the data we need to send when we need to send it.

Also fixed a couple of the links on the status display function.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
2014-01-08 05:48:49 -05:00
d3athrow
64d8903802 Following /tg/'s lead, removes set background 1 for smoother gameplay.
Conflicts:
	code/game/objects/effects/glowshroom.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/living/silicon/mommi/life.dm
2014-01-08 01:25:20 -05:00
Ccomp5950
0c5cff952e Dirt Fixes. Pass ALL the attack_by's to the floor.
Conflicts:
	code/game/objects/effects/decals/Cleanable/misc.dm
2014-01-07 05:45:26 -05:00
errorage
eeeb68638f Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion.
Conflicts:
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/robot.dm
	code/game/objects/items.dm
	code/modules/mob/living/silicon/robot/inventory.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2014-01-06 20:57:04 -05:00
Mark Aherne (Faerdan)
5d04a41151 NanoUI updates.
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
2014-01-05 23:28:52 -05:00
Rob Nelson
68fd13b90c Fix fire extinguisher not being fillable with the top off. 2014-01-05 22:35:30 -05:00
d3athrow
752a61087a Adds an open button next to comms sayers name that opens the nearest airlock to them maximum of 3 tiles away. does not work for people not on camera or using something that makes them untrackable(digital camo, agent card, ninja mask, etc) 2014-01-05 19:21:35 -05:00
ZomgPonies
aa8fcc9b15 Randomized lawset system + config options 2014-01-05 17:50:13 -05:00
ZomgPonies
fdc1f7c455 More explosion optimisations 2014-01-05 00:55:24 -05:00
Mark Aherne (Faerdan)
0a29d579c6 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	nano/js/libraries/2-jsviews.js
	nano/templates/chem_dispenser.tmpl
	nano/templates/telescience_console.tmpl
2014-01-05 00:48:28 -05:00
ZomgPonies
e9feda83cb Crematorium typo 2014-01-04 21:33:04 -05:00
Nanai
69e713c04a Surgery Update
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.

Conflicts:
	code/modules/surgery/ribcage.dm
2014-01-04 15:44:23 -05:00
ZomgPonies
ca011ee962 NanoUI update 2014-01-04 03:50:54 -05:00
ZomgPonies
703b35d3dc Optimized explosions, not recursive ones 2014-01-04 03:21:07 -05:00
ZomgPonies
6827a12afe Fire extinguishers can now spray any reagent desired. 2014-01-03 21:22:53 -05:00
DJSnapshot
8f9e08150e mecha fixes 2014-01-02 20:51:47 +01:00
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies
47b19fc653 Player-controlled giant spiders 2013-12-30 18:18:02 -05:00
ZomgPonies
5e3dca39a1 Supply pack bugfixing 2013-12-30 12:46:44 -05:00
ZomgPonies
6bae66a53a Small bugfixes 2013-12-29 17:04:18 -05:00
ZomgPonies
04542065e5 Tons of new Mafia-theme stuff 2013-12-29 14:30:29 -05:00
ZomgPonies
e75a51026d PDA fix 2013-12-29 14:00:36 -05:00
ZomgPonies
1a58a959b6 Morgue fix 2013-12-29 13:52:58 -05:00
ZomgPonies
ae3ff027a9 Morgue/Crematorium Update 2013-12-29 13:25:31 -05:00
ZomgPonies
4c6e8fdbd4 NanoUI PDA optimizations 2013-12-29 12:32:51 -05:00
ZomgPonies
39a86ccc8e Gun cabinet sprite fix 2013-12-28 14:00:40 -05:00
ZomgPonies
9bd4cc07db Adds kittens 2013-12-28 12:58:54 -05:00
ZomgPonies
20ae80510a Adds gun cabinets 2013-12-28 11:25:11 -05:00
ZomgPonies
38682de629 Adds ability to write on walls with blood 2013-12-28 11:08:52 -05:00
ZomgPonies
55eb99315e New security gasmasks 2013-12-28 09:31:53 -05:00
ZomgPonies
80b76cf076 Fix PDA messenger bug 2013-12-28 08:47:58 -05:00
ZomgPonies
1d47723912 uplink fix 2013-12-28 07:54:04 -05:00
ZomgPonies
dcaeea24bf Adding large cardboard boxes 2013-12-25 07:06:13 -05:00
ZomgPonies
9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies
9a8d2ff8b8 Removedd console spam 2013-12-23 02:54:20 -05:00