Commit Graph

11708 Commits

Author SHA1 Message Date
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears
Tiny objects on ears
2014-01-10 13:47:10 -08:00
Mloc-Argent
4c1e17649e Merge remote-tracking branch 'upstream/master' into dev 2014-01-10 20:07:47 +00:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff
[TG] Lots of small (and maybe not so small) changes from tg.
2014-01-09 22:33:28 -08:00
Ccomp5950
2b57605738 Merge pull request #4253 from SkyMarshal/mining
Fix for mining.
2014-01-09 17:22:12 -08:00
SkyMarshal
8885ad630e Fix for mining.
Fixes #4249
2014-01-09 17:26:13 -07:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
DJSnapshot
418a4b3631 Merge pull request #4247 from Zuhayr/master
Cryostorage fixes.
2014-01-09 14:39:08 -08:00
RKF45
c47be94b42 Removes braindeath as IC term 2014-01-09 21:49:21 +01:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
Zuhayr
f311177654 Changed world loop to all_objective loop in cryopod check. Added all_objective add/remove procs to datum/objective. 2014-01-10 01:24:24 +10:30
Zuhayr
a81fd94db1 Objectives will now updated when the target enters cryostorage. 2014-01-09 22:59:16 +10:30
Zuhayr
54015ccdf4 Fixes some items remaining after the pod procs. 2014-01-09 22:06:26 +10:30
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes
Lots of bugfixes.
2014-01-09 02:47:20 -08:00
YotaXP
c6d820b04f Fixed a major bug. Improved speed further. 2014-01-09 10:25:48 +00:00
ZomgPonies
09c56a0930 BS12 compile fixes for Constructs 2014-01-09 04:49:16 -05:00
ZomgPonies
7829c13c36 Typo compile fix 2014-01-09 04:46:27 -05:00
ZomgPonies
b4f401e3b6 Constructs missing all their abilities -- Taken from /tg/
Desc of constructs and cult mode promises certain abilities to various
constructs that were missing. Also fixes some typos.
2014-01-09 04:40:37 -05:00
SkyMarshal
37ec915386 Reverts some geometry code to a functional state.
Fixes #4045
2014-01-08 23:00:11 -07:00
SkyMarshal
f79ffa598e Tradeband and Gutterspeak now have a different font than Tradeband.
Fixes #4143
2014-01-08 22:15:47 -07:00
SkyMarshal
8ecfd56540 Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.
Fixes #2485
2014-01-08 21:36:03 -07:00
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07: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