cib
7bf03bc920
Removed redundant code/modules/detectivework
2012-10-27 12:10:59 +02:00
Cael_Aislinn
e8b44dca13
made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-27 19:59:05 +10:00
Cael_Aislinn
1d1c907bfb
made fire extinguishers not freeze everything
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-27 19:20:51 +10:00
Spamcat
665c840da3
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-26 23:57:05 +04:00
Ater Ignis
156320eb3c
people suffocating in lockers and bodybags maybe cool, but suffocating in healing sleeper or dna modifier - bad, let's revert that back?
2012-10-26 13:17:04 +04:00
Hawk-v3
a8d5e9e019
Merge pull request #1830 from theMIj/master
...
Xenoarch: artifacts, strange rocks, pretty orebox
2012-10-26 01:44:49 -07:00
Hawk-v3
98365e5996
Merge pull request #1832 from comma/master
...
Holsters and bunny slippers.
2012-10-25 15:30:48 -07:00
Spamcat
609c75fe58
Matches can be put in ashtrays as well.
2012-10-25 23:37:32 +04:00
Ater Ignis
55c553f535
1) show dismemberments on player: erase limbs which are ORGAN_DESTROYED
...
2) if player is husk - still try to overlay robotic limbs if they are present, but not anything else
3) human without legs can't stay, right? but he can crawl if there exist any part of arm or leg - only fully delimbed body can't move
2012-10-25 20:00:44 +04:00
Ater Ignis
6337048aad
updated grenades, now with remote control, proximity control and timer control for your choosing
2012-10-25 19:56:32 +04:00
Mij
e63277ee04
Fixed my ore box mistakes
...
Keeps strange rocks out of ore boxes. Actually changes sprites in the
correct place. >.>
2012-10-25 08:48:25 -07:00
Chinsky
9716049b4e
Fixed derp.
2012-10-25 17:53:59 +04:00
Chinsky
eb72f2d48e
Fixed couple of holster messages typos.
...
Reworked way isHolster() works.
Fixed bug with detecive revolver, making it impossible to reload.
2012-10-25 16:32:57 +04:00
headswe
71d3154f26
Merge pull request #1833 from caelaislinn/bs12_with_tgport
...
misc fixes
2012-10-25 04:46:12 -07:00
Cael_Aislinn
96813cac8e
another partial fix
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 21:30:26 +10:00
Cael_Aislinn
b35fc75a33
partial antiqua compile fix
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 21:23:40 +10:00
Cael_Aislinn
d3f77398a6
decreased blob expand rate from 3 seconds to 7 seconds
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 20:39:00 +10:00
Cael_Aislinn
b7bc344d6e
fixed an issue where mods could gain access to admin powers
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 20:31:00 +10:00
Cael_Aislinn
e8be4ac9f8
fixed kobolds (?) brought in supermatter and cleaned it up a bit
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 20:30:40 +10:00
Hawk-v3
33ae8fa4f3
Merge pull request #1826 from Ravensdale/master
...
Map fix
2012-10-24 17:24:41 -07:00
Chinsky
236780d8c6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2012-10-25 03:42:20 +04:00
Hawk-v3
a802c10f5d
Merge pull request #1829 from caelaislinn/bs12_with_tgport
...
misc, including random fire fix
2012-10-24 15:29:01 -07:00
Chinsky
919458e8be
Forgot to commit icons for my previous commit.
2012-10-25 02:03:08 +04:00
Chinsky
9d34691b82
Added holsters and bunny slippers.
...
Holsters work a bit different from before.
They utilize system for clipping things on uniform.
So now holster can be worn on any clothing.
Also it can now hold any handgun(or what I assumed to be handgun).
2012-10-25 02:00:48 +04:00
Mij
4166ae3e3f
Xenoarch: artifacts, strange rocks, pretty orebox
...
Artifacts and strange rock formations spawn during world gen. Frequency
may need tweaking.
Strange rocks melt when acid hits them due to what I assume are changes
/tg/ made with how acid works. Alternately I missed something during
copypasta spree. I'll muck with it later. For now, harvesting always
works with applied welding tools.
Ore boxes back to old beautiful selves. Re-added a few icons to
mining.dmi and the strange rock icon to turfs.dmi
2012-10-24 12:38:46 -07:00
Cael_Aislinn
7aee209637
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
2012-10-25 00:35:19 +10:00
Cael_Aislinn
8d22166941
- tweaked lplasma spills and fire spawning - oxygen content is no longer counted towards % spawn chance.
...
- to spawn a turf fire (at default ignition level) atmos zones now require at least 17 moles of ignitable material (note that flamethrower fuel counts 15x more than other ignitables)
the relevant code seems weird and all over the place, but this seems to work in testing so i'm committing it for now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-25 00:33:47 +10:00
Cael_Aislinn
5bee6e1d24
ghosts have universal talk again
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-24 23:45:57 +10:00
Cael_Aislinn
3ebb8b2173
remove random debug msg
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-24 23:25:24 +10:00
Cael_Aislinn
a9431fcecf
removed immovable rod from occurring, removed space dust, doubled time between events
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-24 23:06:41 +10:00
Hawk-v3
76e6977f3a
Merge pull request #1827 from theMIj/master
...
msay fix
2012-10-23 21:19:39 -07:00
Mij
9be730245a
Mij's first attempt at a commit. Please lemme know if this doesn't work.
...
Adds msay verb to admin observers and above, including admins and mods. Test successful on local build.
2012-10-23 21:14:17 -07:00
Ravensdale
ca12f83a9c
Fix to: AI core wiring to prevent power sinks from draining AI APC's. visible pipe manifest visible in research. Minor wiring tweak to SW solar array.
2012-10-23 13:53:53 -07:00
Spamcat
23960a8064
Cigarette quickfix.
2012-10-23 23:58:11 +04:00
headswe
13cb40b637
Merge pull request #1819 from Asanadas/master
...
Misc: commented out end-round sounds, the two tiniest // ever.
2012-10-23 08:47:50 -07:00
headswe
0d98248b6f
Merge pull request #1821 from comma/master
...
Pain & Other Ported Things
2012-10-23 08:47:30 -07:00
Spamcat
d555f06f8d
fixed map conflict
2012-10-23 17:59:35 +04:00
Spamcat
7183a7c3d3
Merge https://github.com/Baystation12/Baystation12
2012-10-23 17:56:00 +04:00
Cael_Aislinn
721dfeda57
removed old taj files
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-23 23:14:38 +10:00
Chinsky
8a27cfdb91
Reverted clown coords changes on Cael's request, he has something for that in his pull request.
2012-10-23 12:45:08 +04:00
Chinsky
27e8b7ea50
Readded autocapitlizing said messages.
2012-10-23 12:36:26 +04:00
Asanadas
fca22627f9
Commented out end-round sounds, and banging donks.
2012-10-23 00:14:17 -04:00
headswe
903464af45
Merge pull request #1774 from jediluke69/master
...
fixes for maintance access
2012-10-22 17:07:31 -07:00
Asanadas
67e682fd6a
Merge pull request #1 from Baystation12/master
...
Merge
2012-10-22 16:53:23 -07:00
Spamcat
512daeeee7
Ported ashtrays, cigs don't produce cigbutt obj when they are put down.
...
Added ashtrays to every breakroom.
2012-10-22 21:41:56 +04:00
jediluke69
650064daaf
Update code/game/jobs/access.dm
2012-10-22 14:41:25 -03:00
Hawk-v3
e4c82fdf47
Merge pull request #1804 from caelaislinn/bs12_with_tgport
...
tg updates, misc other stuff
2012-10-22 06:57:35 -07:00
Spamcat
2cea1ecf7e
Merge https://github.com/Baystation12/Baystation12
2012-10-22 17:55:05 +04:00
Chinsky
b46c887469
Ported implants.
...
Compressed matter implant.
Death alarm implant.
Made explosive implant work like pre-merge: trigger on code phrase instead of host's death.
2012-10-22 17:52:27 +04:00
Cael_Aislinn
e3e568f450
updated changelog
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-22 20:26:21 +10:00
