cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,121 Commits 74 Branches 23 Tags
ef4ee093a5ffea35060dc846ffcb7015da65389c
Commit Graph

7758 Commits

Author SHA1 Message Date
Chinsky
513e4463c5 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/clothing/spacesuits/rig.dm
 2012-10-29 07:23:19 +04:00
Chinsky
165ec69cfa Return of the moderator. 2012-10-29 07:12:02 +04:00
Hawk_v3
23801464cf Merge remote-tracking branch 'upstream/master' 
Conflict resolved:
	code/modules/clothing/spacesuits/rig.dm
 2012-10-29 01:29:47 +00:00
Chinsky
95d5912c2d Readds missing wizard rigsuit. 2012-10-29 04:54:57 +04:00
Chinsky
5281cbf2e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-29 04:28:32 +04:00
Chinsky
27eaaa01d1 Ported virus2 system and machinery. 
Viruses2 do not spawn anywhere yet, until machinery is on map.
 2012-10-29 04:27:58 +04:00
Hawk_v3
9185b5189c RIGs have heat resist. 
Firesuits have cold resist.

You're welcome. ^v^
 2012-10-28 23:39:50 +00:00
Ater Ignis
f4f3beeacb that must be a bit more correct, i think 2012-10-28 21:52:09 +04:00
Cael_Aislinn
10034cdac4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/modules/clothing/suits/suit_cramp.dm
	code/modules/mob/living/carbon/human/inventory.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-29 02:19:28 +10:00
Hawk-v3
299c8d6433 Merge pull request #1848 from Hawk-v3/master 
Cryo edit. No More Alien Race Damage.
 2012-10-28 03:31:39 -07:00
Hawk_v3
b64a1cfe69 Fixed a unused area in Cryo. 
Removed damaging effects to alien players. C'mon, we whitelist them already!
 2012-10-28 10:28:12 +00:00
headswe
9fda27f6a9 Merge pull request #1820 from Spamcat/master 
Alt satchels, adjustable masks, ashtrays.
 2012-10-28 02:33:19 -07:00
headswe
5c9ab3c6d3 Merge pull request #1836 from AterIgnis/detonators 
Detonators assembly
 2012-10-28 02:32:19 -07:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
Hawk_v3
fe6ed49062 Atmospheric Pressure Suits 2012-10-28 07:11:51 +00:00
Hawk_v3
8e877047d9 Reverted Suit Cramping 
Hawk_v3
 2012-10-28 07:01:02 +00:00
Hawk-v3
59021935a0 Merge pull request #1843 from CIB/master 
Removed duplicate folder and fix to cryo
 2012-10-27 23:44:24 -07:00
Cael_Aislinn
12a677cf0b increased cramp interval, removed damage chance 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-28 15:43:55 +10:00
Ater Ignis
547635a0c4 raise default range value of proximity sensor from 1 to 2 2012-10-28 08:37:03 +04:00
Cael_Aislinn
b88aaea336 halved species-unfitting damage, made cramp damage actually stick to max 10 + lowered accum rate 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-28 10:30:39 +10:00
headswe
dcfdd23ef0 Merge pull request #1838 from AterIgnis/antisuffocate 
Anti-suffocate
 2012-10-27 10:03:41 -07:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Ater Ignis
61e16ee87f updated code to more readable 2012-10-27 19:29:48 +04:00
Cael_Aislinn
5b5153ee37 some tweaks to fire - it consumes fuel faster, and properly goes out after a while, hopefully fix for 1 * 10e-99 burning fuel bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-27 23:39:17 +10:00
Cael_Aislinn
d38670f75a heavy suits cause cramps over time (minor brute damage at intervals of a few minutes), also made species clothing incompatabilities actually affect the relevant body parts 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-27 23:16:12 +10:00
cib
c11b765d2c Increased cost of cryo. 
- It now uses twice as much oxygen
- Cryoxadone and clonexadone now heal brute, burn and oxyloss much slower, though cloneloss remains at the same speed.
 2012-10-27 12:45:42 +02:00
Cael_Aislinn
0e279a3e34 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-27 20:44:54 +10:00
cib
b6e662a2e9 Cryo now just makes the air vanish, instead of overpressurizing medbay. 2012-10-27 12:39:21 +02:00
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
d17f1adfab ED-209 is a security bot, but not Beepski, do not check for ED being Beepski and 'bang' - it appears on security pda as expected 2012-10-26 15:51:36 +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
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