cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,959 Commits 10 Branches 0 Tags
f5a790a037068f6f115cc89fb38b40a41f25c99a
Commit Graph

4491 Commits

Author SHA1 Message Date
SkyMarshal
f5a790a037 Merge pull request #1215 from Erthilo/master 
Records System <3
 2012-05-31 20:57:40 -07: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
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
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
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
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
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
Erthilo
b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2012-05-29 15:00:11 +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