Commit Graph

1007 Commits

Author SHA1 Message Date
mwerezak
e510f6625f Fixes IV stands blocking bullets
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.

Flipped tables now block small mobs.
2015-05-26 23:05:38 -04:00
PsiOmega
51231538ed Changelog update. 2015-05-22 08:27:42 +02:00
Chinsky
53e3e2f6e6 Merge pull request #9379 from Zuhayr/materials
Materials + Morguemeat icon + bat nerf
2015-05-21 03:23:41 +03:00
Chinsky
9d14bc41de Merge pull request #9389 from mwerezak/fire
Fire
2015-05-21 03:13:55 +03:00
Zuhayr
c3f0f42ec2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials 2015-05-21 00:49:14 +09:30
Zuhayr
98def6e247 Updating dev from master. 2015-05-21 00:08:22 +09:30
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Zuhayr
06c04edb5e Merge pull request #9337 from comma/ghettoMD
Ghetto MDing
2015-05-19 20:38:50 +09:30
mwerezak
953e8be44e Fire tweak 2015-05-19 00:09:37 -04:00
ccomp5950
43c10d7d60 Changelogs 2015-05-18 18:51:49 -04:00
Chinsky
8e5f5ef8e0 Merge pull request #9165 from Yoshax/trapping
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
PsiOmega
187e7e869a Changelog update. 2015-05-18 17:51:42 +02:00
Chinsky
33e8791fe9 Merge pull request #9264 from Hubblenaut/airlocks
Fixes airlock wires
2015-05-18 18:21:05 +03:00
Chinsky
ec499ac941 Merge pull request #9307 from Kelenius/ofChemAndChangelogs
Adds chemistry update changelog
2015-05-18 18:20:46 +03:00
Chinsky
6169c49832 Merge pull request #9143 from Loganbacca/qol_mule
[QOL] MULE destination selection
2015-05-18 18:20:17 +03:00
Hubblenaut
86426d0424 Fixes airlock wires and adds backup power light 2015-05-18 16:55:12 +02:00
Chinsky
83803fa069 Changelog 2015-05-18 08:03:02 +03:00
Chinsky
b08fcb8d3e Merge pull request #9297 from PsiOmegaDelta/RandomWireBreaking
Destroying a camera now also cuts wires randomly.
2015-05-18 00:40:56 +03:00
Zuhayr
8917a03380 Merge pull request #9296 from PsiOmegaDelta/TurfProcessing
Turf processing
2015-05-17 22:51:45 +09:30
Zuhayr
4ea779ae6c Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
Cleans up welder code.
2015-05-17 20:21:31 +09:30
PsiOmega
1c32612dbd Updates changelog. 2015-05-17 11:30:29 +02:00
PsiOmega
c16d033b18 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-17 11:30:04 +02:00
Zuhayr
18c0760c56 Changelog. 2015-05-17 18:26:39 +09:30
PsiOmega
b636b3d9d2 Changelog update. 2015-05-16 22:38:28 +02:00
Kelenius
be53fafa96 Adds chemistry update changelog 2015-05-16 20:35:22 +03:00
PsiOmegaDelta
d4c205e12a Merge pull request #9200 from mwerezak/tail-swish
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
PsiOmega
76b828ab7d Changelog entry. 2015-05-16 14:47:04 +02:00
PsiOmega
534e5fafc4 Changelog entry. 2015-05-16 14:13:32 +02:00
PsiOmega
26ad3d2b92 Changelog entry. 2015-05-16 11:04:40 +02:00
PsiOmega
180a5732a1 Changelog entry. 2015-05-16 10:29:17 +02:00
mwerezak
7c242b2c8c Tail animation resets when unconscious, changelog 2015-05-14 19:14:22 -04:00
GinjaNinja32
21394e78c4 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-15 00:12:40 +01:00
PsiOmega
5ca2e74a47 Changelog update. 2015-05-14 22:22:02 +02:00
PsiOmega
f9306431b7 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2015-05-14 22:20:58 +02:00
Loganbacca
e3564a5d80 MULE destination update
- MULE destination selection is now handled using a list
2015-05-15 00:03:38 +12:00
PsiOmegaDelta
9ed8f69e02 Merge pull request #9240 from Techhead0/internalsBox
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
Chinsky
713deb4137 Merge pull request #9253 from PsiOmegaDelta/StealthFixes
Adjusts rig stealth module costs.
2015-05-14 04:17:56 +03:00
PsiOmega
09754dbd18 Changelog entry. 2015-05-13 23:39:03 +02:00
PsiOmega
2fac0b4d64 Changelog entry. 2015-05-13 23:02:41 +02:00
GinjaNinja32
5820873dab Makes gambling tables constructable. 2015-05-13 21:34:31 +01:00
GinjaNinja32
fb329fb8e0 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-13 20:46:58 +01:00
GinjaNinja32
5f65565f45 Bugfixes, removing the remnants of table_parts, changelog. 2015-05-13 20:40:00 +01:00
Chinsky
ef79eb920d Merge pull request #9224 from PsiOmegaDelta/BrigGarbage
Map cleaning.
2015-05-13 18:09:28 +03:00
Zuhayr
847f1baaa8 Merge pull request #9228 from Techhead0/portablepump-in
PAPs now use external pressure when pumping in.
2015-05-13 16:59:16 +09:30
Techhead0
f41300bbe3 Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox
Conflicts:
	maps/exodus-1.dmm
2015-05-13 03:10:36 -04:00
Techhead0
e38ef1c7ef Moves survival boxes to species datums.
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
2015-05-13 02:31:17 -04:00
Techhead0
bdf4400695 PAPs now use external pressure when pumping in.
This allows Portable Air Pumps to be effectively used for draining rooms
and air tanks.
Also, default cells in pumps and scrubbers changed from 1k basic cells
to 5k heavy-duty cells.
2015-05-12 13:55:06 -04:00
PsiOmega
13e036ccd2 Changelog entry. 2015-05-12 14:26:24 +02:00
PsiOmega
31bcb717dc Changelog update. 2015-05-12 13:42:20 +02:00
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00