Commit Graph

4466 Commits

Author SHA1 Message Date
SkyMarshal
36daf6fada Merge pull request #1211 from Erthilo/master
Fixed cloning not working for burnt people. Also fixes some NOCLONE's that were missed.
2012-05-31 16:07:46 -07:00
Rob Palkowski
ce55bf16cb @skymarshal accidentally a few words. 2012-05-31 15:40:39 -07:00
Erthilo
ebaa460892 Fixed cloning not working for burnt people. Also fixes some NOCLONE's that were missed. 2012-05-31 21:55:51 +01:00
Erthilo
621b5f8179 Fixes Tajaran appearance and reverts update_lying() for now. 2012-05-31 17:35:04 +01:00
Erthilo
8a69a6416c Fixed humans faces lying down when standing up. 2012-05-31 16:28:47 +01:00
Albert Iordache
28bc3fa766 Merge pull request #1204 from Aryn/master
Bugfixes
2012-05-31 01:50:40 -07:00
Albert Iordache
ecd8e6952d Merge pull request #1202 from Erthilo/master
Void suit sprites, mutantrace fixes
2012-05-31 01:45:32 -07:00
Albert Iordache
4891a26a7e Merge pull request #1197 from Uristqwerty/master
Some unused icon generation code
2012-05-31 01:43:38 -07:00
Albert Iordache
bf090287df Merge pull request #1196 from SkyMarshal/CoolTweaks
Some comments, tweaks, and improvements to detective work, evidence bags, and packages.
2012-05-31 01:42:45 -07:00
Aryn
ac00001399 Made some more airflow changes that are irrelevant until I get airflow working. 2012-05-31 00:25:52 -06:00
Aryn
db79302749 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-31 00:18:44 -06:00
Aryn
8fe372f2d2 Fixed a long-standing temperature bug by correcting the thermal energy calculations. Reduced amount of gas that flows per tick. 2012-05-31 00:14:33 -06:00
Albert Iordache
f7d61de403 Slowed down ZAS depressurization 2012-05-31 07:48:43 +03:00
Erthilo
3d3f49bea1 Fixes mutant races forever lying down. 2012-05-31 01:55:07 +01:00
SkyMarshal
f2b6147432 Whoops! 2012-05-30 16:37:41 -07:00
SkyMarshal
2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
Lexus Langg
04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite.
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
2012-05-30 15:27:00 -07:00
Uristqwerty
42aa91d6f2 Adding some (currently unused) icon generation stuff
Basically, a more generalized version of the rune code,
split into more reusable procs. Plus one that generates
a version of an icon that has a neat bluespace effect
applied.
2012-05-30 17:54:33 -04:00
SkyMarshal
c82b90e24d Some comments, tweaks, and improvements to detective work, evidence bags, and packages. 2012-05-30 13:27:20 -07:00
SkyMarshal
770e09ce5d Merge pull request #1191 from Mloc/varfix
Huge commit!  Standardizes var definitions in most places.
2012-05-30 11:07:27 -07:00
Albert Iordache
37dec6e15e Revert "All objects leaving the boundaries of a Z level will now be deleted"
This reverts commit 606a4a75fe.
2012-05-30 20:23:25 +03:00
Albert Iordache
606a4a75fe All objects leaving the boundaries of a Z level will now be deleted 2012-05-30 20:14:21 +03:00
Albert Iordache
3e431b0ae0 Removed some ZAS messages sent to the error log 2012-05-30 20:11:18 +03:00
CIB
7e904195f1 Maybe this will fix Tajaran appearance 2012-05-30 20:04:52 +03:00
Mloc
66f633edc0 Fixed some quirks with var standardization, fixed compile error #1190.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-30 12:07:13 +01:00
Aryn
da12638dcc Hotfix to update_visuals() to make it compatible with the integer-based checks. 2012-05-30 01:50:58 -06:00
Aryn
354d023a4b Optimized HUD images. 2012-05-30 01:37:52 -06:00
Aryn
37125a42f9 Fixed bugs and optimized ZAS. 2012-05-30 01:33:58 -06:00
unknown
b68b5950a2 No more wanted alerts when someone fails to post a feed story. 2012-05-30 15:05:14 +10:00
Mloc
fbb67b2e42 Huge commit! Standardizes var definitions in most places.
Signed-off-by: Mloc <colmohici@gmail.com>
2012-05-29 16:26:48 +01:00
CIB
5f030b1117 Merge pull request #1189 from CIB/master
Change projectile fix
2012-05-29 06:46:21 -07:00
Mloc
7da503e2c5 Merge pull request #1188 from sick-trigger/master
Fixes teleporting with an active chamelion projector
2012-05-29 06:46:04 -07:00
cib
f3dd3dfe9f The change projectile code is a lovely copypaste again. 2012-05-29 15:45:00 +02:00
cib
3a74270e29 Merge github.com:Baystation12/Baystation12
Conflicts:
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2012-05-29 13:43:20 +02:00
sick-trigger
83e37be057 Allows you to teleport while disguised as a banana. 2012-05-29 20:31:36 +10:00
sick-trigger
2b43fd81b8 Allows you to teleport while disguised as a banana. 2012-05-29 20:29:54 +10:00
Albert Iordache
604f7c417d Merge branch 'master' of https://github.com/Aryn/Baystation12 into Aryn-master
Conflicts:
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
2012-05-29 08:50:58 +03:00
SkyMarshal
12392f74dd Merge pull request #1185 from Erthilo/master
HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes
2012-05-28 22:13:53 -07:00
sick-trigger
fb9acbaa08 Actually fixes digging sand messages 2012-05-29 13:56:36 +10:00
Aryn
a8215ce62f Made some airflow changes. They won't be included in the processing code until they're more thoroughly tested, but the code is here anyway. 2012-05-28 16:42:40 -06:00
Aryn
c9478c6a46 Made SkyMarshal's recommended changes. 2012-05-28 16:41:18 -06:00
Erthilo
cdb1cb3a4f Fixes a typo, and changelog. 2012-05-28 20:50:45 +01:00
Erthilo
4d7b4b284c Fixes for response team notes. Soghun removed from staff of change. 2012-05-28 20:42:47 +01:00
Erthilo
71b0c5d024 Surgeons spawn with scrubs, Emergency Physicians spawn with first responder jackets. 2012-05-28 20:42:15 +01:00
Erthilo
2b2c8120f7 More HUD changes: https://dl.dropbox.com/u/4911517/ShareX/2012-05/2012-05-28_20-40-50.png 2012-05-28 20:41:05 +01:00
Erthilo
e106fe4c51 Adds water bottles to vending machines. 2012-05-28 20:14:19 +01:00
SkyMarshal
7a37d9bb05 Merge pull request #1167 from Erthilo/TGUpdates
TG Updates r3648 to r3657
2012-05-28 11:52:44 -07:00
Erthilo
2cf86ef25e Changed MAX_NAME_LEN to 40. 2012-05-28 20:52:04 +02:00
Erthilo
88846eb099 Fixes to Tajaran lying down sprites. Removed "lipstick" from Soghun/Tajaran. Removed "bumps" from Soghun. 2012-05-28 19:49:10 +01:00
sick-trigger
58a23c8d10 Fixes #1180 2012-05-28 19:18:07 +10:00