cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,253 Commits 9 Branches 0 Tags
314911e458d35df55d1782ebf4efbc996887d726
Commit Graph

7871 Commits

Author SHA1 Message Date
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
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
Chinsky
236780d8c6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-25 03:42:20 +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
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
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
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
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
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
c0e7ad00b2 merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:25:27 +10:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:15:05 +10:00
Cael_Aislinn
ecb74a32d2 fix for admins not being applied properly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:57:50 +10:00
Cael_Aislinn
9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:35:03 +10:00
giacomand@gmail.com
6f7c26629d -Changed xeno to have a safe way to hatch eggs with plasma. 
http://imgur.com/80LJx

-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 05:41:00 +00:00
Kortgstation@gmail.com
068fc7afda Replaced a ton more for viewer in range things with visible_message 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4934 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 04:30:19 +00:00
Chinsky
91b61f91e7 Readded pain and shock system. 
Tramadol and oxycodone are back too.
 2012-10-22 06:38:57 +04:00
Kortgstation@gmail.com
20ddf29dae Syndicate simple animals will now attack windows/grilles/closets/tables they come into contact with so you can't cheat and tank with them. 
Added an attackanimal to closets. Anything with wall_smash will be able to break them. This means Juggernauts can punch open closets now.

Replaced all the for mob in viewer shit with visible_message in OpTable.dm and table_racks.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4933 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-22 02:26:34 +00:00
giacomand@gmail.com
0f88f133fb Commiting for Numbers: 
* Flour produce should be accurate now producing a whole lot now
* Added multipliers to grinder nutriment transformation functionality. Any negative number is treated as a multiplier now -1.5 would turn x nutriments into 1.5x products etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4932 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 21:40:16 +00:00
Chinsky
ad7cd0ed58 ID biometry. 
Bloodtype, DNA and fignerprint are back to ID
 2012-10-22 00:41:43 +04:00
Chinsky
4d9d407aa6 Added back tape rolls. 
Two rolls in engie lockers because there are only tow lockers on map
 2012-10-22 00:16:22 +04:00
Spamcat
59beeab301 Adjustable masks. 2012-10-21 23:23:08 +04:00
Spamcat
def7d83e0f Re-added alt satchels. 2012-10-21 23:21:40 +04:00
giacomand@gmail.com
d5422f6a7e -Grilles can now be destroyed by fires. 
-Added a define for the minimum amount of damage a mob takes from plasma.
-Increased it to 20, from 10.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4931 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 19:03:50 +00:00
Chinsky
4fd1322dcf Made clown planet coords card not working. 2012-10-21 19:59:36 +04:00
Chinsky
5e4273c919 Fixed runtime in secure briefcase code. 2012-10-21 17:58:54 +04:00
Chinsky
7ae59ba6f7 Slapped a few nullchecks near reported runtimes. 2012-10-21 16:41:44 +04:00
Kortgstation@gmail.com
3a52f9b2b7 Added items to the crates on the space battle map. Added new areas for the various syndicate ships instead of all of them being Nanotrasen Cruiser. 
Captain now spawns with an armoured vest on and his spacesuit spawns on the rack with his jetpack/helmet. This means the suit will exist even if a captain doesn't at round start.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4930 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 10:31:16 +00:00