LightningIron
756214fbc7
Reverted lockbox removal which was on my master branch. Should be merged with next dev.
2014-01-08 21:13:55 -06:00
LightningIron
24be1d4a23
Fixed accidental change of ninja cell to super capacity.
2014-01-08 21:10:17 -06:00
LightningIron
7a37eac624
Miscellaneous ninja fixes and ability cost changes (because nearly all were inconsistent with listed/actual cost), e-net fix
2014-01-08 20:52:51 -06:00
LightningIron
8ae2266526
Added captured variable to mobs, non-chair equivalent to being buckled into a chair
2014-01-08 20:49:45 -06:00
Zuhayr
b2da52098a
Removing my debug changes.
2014-01-09 13:07:02 +10:30
Zuhayr
68499b4ae2
Fixes #4151
2014-01-09 12:57:27 +10:30
Zuhayr
f54d75cd35
Fixes #4240
2014-01-09 12:44:17 +10:30
Zuhayr
1f779a010b
Merge pull request #4241 from Faerdan/dev
...
Minor fix for NanoUI
2014-01-08 17:49:22 -08:00
Chinsky
3259ccf86f
Merge pull request #4217 from DJSnapshot/dev
...
Custom stuffs!
2014-01-08 17:22:29 -08:00
Mark Aherne (Faerdan)
8e041670e7
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-09 01:06:24 +00:00
SkyMarshal
d43b2fa492
RCDs no longer create plating with air on it.
...
Fixes #3545
2014-01-08 17:50:59 -07:00
SkyMarshal
81d9483e72
Tweaks the zone rebuilding logic to prevent doors being ignored.
...
Fixes #4046
2014-01-08 17:47:41 -07:00
SkyMarshal
7531bf6c64
Patched holes in SoftDelete that were causing null reference errors.
...
Fixes #3892
2014-01-08 17:45:09 -07:00
Mloc-Argent
c337e5e5f3
More elegant solution to dirt getting in the way.
...
Who needs to click dirt anyway?
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 21:34:15 +00:00
Mloc-Argent
be153d14a3
Fixes for the tg cherrypicks.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 20:32:35 +00:00
Giacomand
363b8e82da
Tweaked meteors to stop playing unnecessary sounds.
...
Made meteors shake the screen more if you're closer and shake the screen of everybody on the station a little (big meteors only).
2014-01-08 20:05:33 +00:00
Kyrah Abattoir
f91b44b47f
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2014-01-08 19:56:03 +00:00
Kyrah Abattoir
98f02be5a6
code/game/object/items/weapons/* lowercase pass
...
code/game/object/structure/* lowercase pass (start)
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
code/game/objects/items/weapons/paint.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/vending_items.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/structures/bedsheet_bin.dm
code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
Kyrah Abattoir
7315b75cca
FIXED: inconsistencies with stack item names.
...
CHANGE: stacks are gender = PLURAL by default because it fits.
Conflicts:
code/game/objects/items/stacks/stack.dm
2014-01-08 19:48:43 +00:00
Kyrah Abattoir
2f0a0243e9
code/game/objects/items/robot/* lowercase pass
...
NOTE: vision modes have to be proper.
Conflicts:
code/game/objects/items/robot/robot_parts.dm
code/game/objects/items/robot/robot_upgrades.dm
2014-01-08 19:47:48 +00:00
Razharas
691e15bb2f
Fixes chameleon projector
...
Conflicts:
code/game/objects/items/devices/chameleonproj.dm
2014-01-08 19:43:27 +00:00
Razharas
3b66f33d14
Fixes morgue trays used by ghosts and what not
2014-01-08 19:39:20 +00:00
Razharas
1f82a6b55a
Fixes beepsky stunning people in things
...
Conflicts:
code/game/machinery/bots/secbot.dm
2014-01-08 19:38:59 +00:00
Razharas
3e476a5507
Fixes mechs click through windows and what not
...
I ded plz fix
2014-01-08 19:36:10 +00:00
Bobylein
91fa949c3a
Allows Labcoats to store Bottles, Beakers, Pills, Pill Bottles and Papers in their suit slot.
...
Conflicts:
code/modules/clothing/suits/labcoat.dm
2014-01-08 19:35:34 +00:00
Cluwnes Honk
dda4403e21
Succesful fixes
...
Fixes instances of "succesful" and "succesfully".
Conflicts:
code/game/machinery/computer/ai_core.dm
code/game/mecha/mech_fabricator.dm
2014-01-08 19:30:28 +00:00
Cluwnes Honk
65ddc5c88e
Adds ckey logging to canisters
...
Lets admins see the ckey as well as the name of those who toggle release valves on canisters.
2014-01-08 19:28:02 +00:00
rymd
5f6a3a01a9
Fixed destructive analyzer failure messages.
2014-01-08 19:27:27 +00:00
Cluwnes Honk
2069a9e83c
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
Conflicts:
code/game/machinery/newscaster.dm
2014-01-08 19:26:10 +00:00
ChuckTheSheep
533600eaa5
Explosion Optimizations
...
Implements a trange that internally checks only turfs and thus less
intensive.
Conflicts:
code/game/objects/explosion.dm
2014-01-08 19:21:47 +00:00
Giacomand
dfdeed7434
Made the follow verb less buggy.
...
Removed duplicated code.
2014-01-08 19:14:15 +00:00
Aranclanos
96cf1b050d
Turfs who spawn with the spawn verb or with buildmode will now use the ChangeTurf() proc and stop making Linda runtime to hell.
...
Conflicts:
code/WorkInProgress/buildmode.dm
2014-01-08 19:13:57 +00:00
Mark Aherne (Faerdan)
b9335e8855
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 12:42:20 +00:00
Mloc
794be2b31e
Fix previous commit for BS12.
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-08 11:49:15 +00:00
YotaXP
68ae21fac3
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
2014-01-08 11:41:51 +00:00
Zuhayr
94829b552c
Merge pull request #4231 from Ccomp5950/pda_fix
...
PDA NanoUI Optimizations.
2014-01-08 02:46:05 -08:00
Mloc
0c48d1b102
Merge pull request #4233 from Zuhayr/dev
...
Commit testing? What's that? Single character fix for pulse checking.
2014-01-08 02:37:42 -08:00
Zuhayr
a040cb8f08
Commit testing? What's that? Single character fix for pulse checking.
2014-01-08 21:07:10 +10:30
Ccomp5950
02d8093daa
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.
2014-01-08 02:20:14 -06:00
Ccomp5950
3df123db38
Merge pull request #4225 from Zuhayr/dev
...
Mixed up some whitelist flags, also added alien reagent reactions.
2014-01-07 20:12:03 -08:00
Ccomp5950
b5d025aec2
Cleanbot/dirt fix.
...
Now if a cleanbot cleans a tile, it will also set it's dirt value to 0
so a person walking back over the tile won't instantly create more dirt.
2014-01-07 21:35:53 -06:00
Mark Aherne (Faerdan)
e9be0ed44e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-01-08 02:31:03 +00:00
Mark Aherne (Faerdan)
eef5013d79
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.
2014-01-08 02:30:33 +00:00
Zuhayr
901dbd634d
Indentation fix.
2014-01-08 11:13:36 +10:30
Zuhayr
787da649c1
Safer way to do the alien thang.
2014-01-08 11:05:58 +10:30
Zuhayr
e8a5b37ea7
Fixed some cocked up checks for alien var.
2014-01-08 10:56:39 +10:30
Zuhayr
c8b595be95
Added an alien var to metabolize procs for humans and monkeys to tie into alien reagent reactions.
2014-01-08 10:27:21 +10:30
Zuhayr
049501a898
Added some limited support for alien reagent reactions.
2014-01-08 10:26:39 +10:30
Zuhayr
1faf2ef25b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:47 +10:30
Zuhayr
073dd32c37
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:36 +10:30