Commit Graph

6550 Commits

Author SHA1 Message Date
ZomgPonies
a405189383 Cult construct abilities fix 2014-01-09 03:03:41 -05:00
ZomgPonies
a59772e5e2 Merge pull request #112 from alex-gh/reagent-fix
typo fix
2014-01-08 21:19:22 -08:00
alex-gh
404ee2ac1f typo fix 2014-01-09 06:02:45 +01:00
Rob Nelson
c14adc6724 Slimes split from a killed adult can understand humans. (#366)
Conflicts:
	code/modules/mob/living/carbon/metroid/death.dm
	html/changelog.html
2014-01-08 21:49:15 -05:00
Rob Nelson
c7215da925 Fix #371 (vermin trying to spawn in assembly line). plus other simple_animal issues.
Conflicts:
	code/modules/events/infestation.dm
	html/changelog.html
2014-01-08 21:49:14 -05:00
Mark Aherne (Faerdan)
e55ba73100 Minor fix for NanoUI
* I was passing src instead of src_object in try_update_ui, this is fixed now.
* Changed checks to use the isnul procl, just to be sure.
2014-01-08 21:22:00 -05:00
alex-gh
d239894e9b Removed water recipe, reagent fixes 2014-01-09 03:00:05 +01:00
ZomgPonies
9be261dd98 Modified Diona speed debuff a bit 2014-01-08 20:39:35 -05:00
ZomgPonies
322001f196 Fix for borers being stolen by other peeps when they are controlling host 2014-01-08 18:57:22 -05:00
Mark Aherne (Faerdan)
4aef8764a8 NanoUI fix.
* Moved the receiveUpdateData JavaScript into the head so that it's loaded first.

This is to prevent an error which occurs if an update is recieved from the server before the UI is fully loaded.
2014-01-08 08:04:06 -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
Zuhayr
64972f267d Commit testing? What's that? Single character fix for pulse checking. 2014-01-08 05:39:54 -05:00
ZomgPonies
2a90d59001 Fixing up security level text 2014-01-08 02:52:35 -05:00
ZomgPonies
f0f6513d4c Merge pull request #109 from SamCroswell/master
Various Fixes/Tweaks to Ninja
2014-01-07 22:34:16 -08: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
Mark Aherne (Faerdan)
8d64095078 NanoUI Updates.
* Restructured HTML in an attempt to fix the "blank UI" issue.
* Added a crap ton of debugging messages.
* Added a loading message to the UI.

Conflicts:
	code/modules/nano/nanoui.dm
	nano/js/nano_update.js
2014-01-07 23:28:51 -05:00
ZomgPonies
906d3b80d8 Small nanoui change 2014-01-07 18:24:38 -05:00
d3athrow
f8bee9a356 Fixes nonhumans getting stuck in walk mode after being targetted 2014-01-07 18:14:49 -05:00
ZomgPonies
9e61df6bdb Bugfix 2014-01-07 05:52:52 -05:00
Ccomp5950
58f76c2f4c Ghost chat unicode support...removed unneeded sanitize() 2014-01-07 05:44:19 -05:00
ZomgPonies
6dd2336ae2 Fixed the way Dionas get their names. Should help fluff. 2014-01-07 04:20:57 -05:00
Zuhayr
d856157f26 More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.
Conflicts:
	code/modules/mob/living/carbon/species.dm
2014-01-07 00:04:27 -05:00
Zuhayr
ab6fb88bf5 Forgot a var. 2014-01-07 00:02:16 -05:00
Zuhayr
f9b8c01c65 Implemented IS_SLOW. 2014-01-07 00:01:52 -05:00
Zuhayr
07c1506551 Implemented NO_PAIN and parts of NO_BLOOD, restructured species flags.
Conflicts:
	code/modules/organs/blood.dm
2014-01-07 00:01:27 -05:00
Zuhayr
e09a00fe0e Fixed a duplicate definition bug with WHITELISTED.
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm
2014-01-06 23:59:21 -05:00
Zuhayr
f66b5a3ccc Removed a return. 2014-01-06 23:47:46 -05:00
Zuhayr
e0d803d158 Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel. 2014-01-06 23:47:21 -05:00
Zuhayr
a8c8bb7fa6 Added NO_BLOOD checks to drips, syringes.
Conflicts:
	code/modules/organs/blood.dm
2014-01-06 23:46:58 -05:00
ZomgPonies
2aaa601aac Part 2 diona update commits 2014-01-06 23:45:22 -05:00
Zuhayr
2c677b2e48 Reusing some unused flags in species.
Conflicts:
	code/setup.dm
2014-01-06 23:35:14 -05:00
ZomgPonies
ce64847903 Fix borg module bug 2014-01-06 23:25:25 -05:00
errorage
46c2645546 - Clicking on an item in your modules list now instantly moves it, the delay between click and it moving to the active module slot, which is seen in the video, is no longer there. 2014-01-06 20:57:35 -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
SamCroswell
802ad91608 Various Fixes/Tweaks to Ninja
Ninjas now actually put a tech disk in their suit when they put it in
your suit. The code was silly and forgot to move the disk inside your
suit when you slotted it in. I fixed some things your death implant pull
request reverted. (SpiderOS things, mainly.), and did some tweaks to the
Spawn Ninja admin verb so we can now specify if we want a random or
preset player, and a random or preset mission to be assigned to the
Ninja.
2014-01-06 18:51:58 -05:00
ZomgPonies
81f8e50131 Nano fix 2014-01-06 17:47:24 -05:00
ZomgPonies
b857c90f6c Compile fix 2014-01-06 17:47:20 -05:00
Fira
70f50e7850 Partial fix for pAI emotes (they still can't hear beyond one container
level, will require a say/emote code hack)

Conflicts:
	code/modules/mob/mob_defines.dm
2014-01-06 17:46:51 -05:00
ZomgPonies
1f39392543 Little compile fixes 2014-01-05 23:36:36 -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
Cheridan
f72bb35e26 Ninja Death Tweak
THE CODE NO LONGER CHECKS IF THE MOB IS A NINJA EVERY TIME SOMEONE DIES

NINJAS GET EXPLOSIVE IMPLANTS TO DUPLICATE THE OLD FUNCTIONALITY

YES I'M MAD

Conflicts:
	code/modules/events/tgevents/ninja.dm
	code/modules/mob/living/carbon/human/death.dm
2014-01-05 22:29:21 -05:00
ZomgPonies
aa8fcc9b15 Randomized lawset system + config options 2014-01-05 17:50:13 -05:00
ZomgPonies
6d4f209e78 Merge pull request #108 from alex-gh/admin_borg_crisis
Added crisis var for borgs. Admins can now manually enable the combat mo...
2014-01-05 13:40:48 -08:00
ZomgPonies
1457095556 Fix Tajaran fat spawns maybe? 2014-01-05 16:40:12 -05:00
alex-gh
f30d5ad7d2 Added crisis var for borgs. Admins can now manually enable the combat module 2014-01-05 20:40:32 +01:00
Rob Nelson
74e6b51b88 Silver slimes now produce drinks upon injection with water. (#345) 2014-01-05 00:50:20 -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
d5ceb38a9d Fixed slimepeople ventcrawling 2014-01-05 00:31:20 -05:00
ZomgPonies
5467c4fdc5 Fat Cats! 2014-01-04 23:26:27 -05:00
ZomgPonies
227fbc8cbe Changed green slime extract effect 2014-01-04 22:22:12 -05:00