Commit Graph

6413 Commits

Author SHA1 Message Date
caelaislinn
e47b5fb21a engineering updates.
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-02 00:46:56 +10:00
Erthilo
11c38cb908 Custom item change for Mangled. 2012-06-01 15:08:03 +01:00
caelaislinn
9c218f2cd2 updating filepaths
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-01 20:22:28 +10:00
SkyMarshal
f5a790a037 Merge pull request #1215 from Erthilo/master
Records System <3
2012-05-31 20:57:40 -07:00
Erthilo
c289540600 Records changelog. 2012-06-01 04:03:33 +01:00
SkyMarshal
cb432489cb Merge pull request #1206 from Erthilo/TGUpdates
TG Update r3659 to r3681
2012-05-31 20:00:50 -07:00
Erthilo
c921336849 Readded spawn(0) and fixed a silly comment. 2012-06-01 03:29:24 +01:00
Erthilo
fe8192ed65 Records system. You can now set your characters Medical and Security records. Remember, these are official NanoTrasen records, and should be written as such. Admins can ban people from using records by selecting 'Records' from the jobban panel. 2012-06-01 03:20:50 +01:00
SkyMarshal
5370676e05 Some fixes for Erthilo 2012-05-31 18:40:05 -07:00
Erthilo
b11d9d494c Merge pull request #1214 from SkyMarshal/CoolTweaks
Made some better text procs for when a gender is ambiguous.  Added a pro...
2012-05-31 18:07:25 -07:00
SkyMarshal
beb63529f9 Made some better text procs for when a gender is ambiguous. Added a proc that will return the proper form of reference to the mob it is called on (mob.get_visible_gender()) which returns a list with the proper forms of reference in it. (In the form of a hashtable.) Also added the proc "get_gender_form("form")" Where it takes the given form and returns the proper one. E.g. on a non disguised man, it will take "it" and return "him". 2012-05-31 17:53:23 -07:00
Erthilo
88a60f95a2 Merge pull request #1213 from SkyMarshal/CoolTweaks
Several changes, any PDA with a security cartridge can be used to gather evidence to be put in the forensic scanning computer, removed a proc that should never have existed, moved the visible_message proc into the atom_procs file.
2012-05-31 16:10:39 -07:00
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
SkyMarshal
87bb7657c6 Merge pull request #1205 from caelaislinn/master
antiqua updates
2012-05-31 16:05:43 -07:00
Erthilo
e2a342dfdf Merge pull request #1212 from dopeghoti/master
Fix some surgery messages oopses.
2012-05-31 15:50:17 -07:00
SkyMarshal
e9ebf14acf Added the capability for the security PDA to scan items in like the detectives scanner, and for it to be loaded into the database in the same manner. 2012-05-31 15:48:53 -07:00
SkyMarshal
b70673e0c8 Some comments, tweaks, and improvements to detective work, evidence bags, and packages. Removed a worthless proc, and moved a few proc definitions into better places. 2012-05-31 15:48:52 -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
CIB
0698fb759a Reduce health loss in crit. (For Erthilo) 2012-05-31 20:59:51 +03:00
Albert Iordache
aed630c0bf Merge pull request #1208 from Erthilo/master
Fixes Tajaran appearance and reverts update_lying() for now.
2012-05-31 09:40:41 -07:00
Erthilo
621b5f8179 Fixes Tajaran appearance and reverts update_lying() for now. 2012-05-31 17:35:04 +01:00
Albert Iordache
28ad9b346e Merge pull request #1207 from Erthilo/master
Fixes humans faces lying down when standing up
2012-05-31 09:12:40 -07:00
Erthilo
8a69a6416c Fixed humans faces lying down when standing up. 2012-05-31 16:28:47 +01:00
Erthilo
014b91cda5 Compile fixes. 2012-05-31 15:14:53 +01:00
Erthilo
8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
2012-05-31 15:09:35 +01:00
caelaislinn
91e9f588b0 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	baystation12.dme

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-31 19:23:11 +10:00
caelaislinn
c5407e8860 antiqua updates
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-31 19:16:22 +10: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
Erthilo
87579932f9 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-31 01:41:07 +01:00
SkyMarshal
f2b6147432 Whoops! 2012-05-30 16:37:41 -07:00
SkyMarshal
5c410c240c Merge pull request #1200 from SkyMarshal/master
Some improvements for the LiquidFood stuff.
2012-05-30 16:28:28 -07:00
SkyMarshal
2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
SkyMarshal
6f34ec4df4 Merge pull request #1198 from Lexusjjss/liquidfood
Added a liquidfood system.
2012-05-30 15:56:59 -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
Erthilo
6b4d7541a2 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-30 18:06:15 +01:00