cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 21:19:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

Browse Source 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
This commit is contained in:
Ravensdale
2014-04-16 21:44:26 -07:00
parent 1d6655850f 20e2991af3
commit 68eda5201b
51 changed files with 11267 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/rd-readme.dm
+1 -1
View File
@@ -121,7 +121,7 @@ When thinking about new stuff, check here to see if there are any slots unfilled
20 |
//BIOTECH
1 | Bruise Pack, Scalple
1 | Bruise Pack, Scalpel
2 | PANDEMIC Board, Mass Spectrometer
3 | AI Core, Brains (MMI)
4 | MMI+Radio
code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
+1 -1
View File
@@ -2,7 +2,7 @@
//changes: rad protection up to 100 from 20/50 respectively
/obj/item/clothing/suit/bio_suit/anomaly
name = "Anomaly suit"
desc = "A sealed bio suit capable of insulating against exotic alien energies"
desc = "A sealed bio suit capable of insulating against exotic alien energies."
icon_state = "engspace_suit"
item_state = "engspace_suit"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)