Commit Graph

1051 Commits

Author SHA1 Message Date
baloh.matevz
2233548788 - Deleted ERP.dmi
- Moved some objects into /effect
- Removed the debugger object

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3739 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-04 21:49:28 +00:00
Erthilo
de809a19ae TG: Fix for Damage Icons. They now have a layer define too.
Revision: r3705
Author: 	 elly1...@rocketmail.com

THIS ALSO FIXES:
Not being able to put items on people's back or belt.
2012-06-03 17:41:54 +01:00
Erthilo
c3c5304397 Various fixes for bans and mutations. 2012-06-03 03:40:26 +01:00
Erthilo
36effbacc2 TG: There's a metric assload of stuff here, mostly in preparation to my massive
traitor expansion, so I'll try to be brief:

- I added in the foundations for traitor factions. See factions.dm for all the
different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list.
Mutation enumerated-identifiers are added into this list. For instance, TK = 1,
COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise
operations could not actually be used after a certain size (because BYOND is
stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under
implantnanoaug.dm for a list of implants and implaners. As mentioned previously,
they are completely functional but may be slightly OP. Among these nanoaugs are
Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer,
Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't
go into detail as to what they do, but hopefully they should be self-
explanitory. If not, check out their descriptions in the file previously
mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg
file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side
sprites because of a technical little issue. I'll change it back to the original
soon). It can be retracted and expanded. Probably only going to be given to
traitors.

- A couple of minor bugfixes here and there, along with some code tidying.

Hope this isn't too large a commit. I intended it to be MUCH larger, but I've
decided to split up my Traitor Factions expansion into smaller commits.
Revision: r3692
Author: 	 vageyenaman
2012-06-02 19:46:18 +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
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
CIB
7e904195f1 Maybe this will fix Tajaran appearance 2012-05-30 20:04:52 +03: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
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
vageyenaman@gmail.com
49647d329a There's a metric assload of stuff here, mostly in preparation to my massive traitor expansion, so I'll try to be brief:
- I added in the foundations for traitor factions. See factions.dm for all the different faction datums. They don't do anything yet.

- I completely ported mob/var/mutations from a bitfield to a generic list. Mutation enumerated-identifiers are added into this list. For instance, TK = 1, COLD_RESISTANCE = 2, XRAY = 3, etc... The purpose of this was because bitwise operations could not actually be used after a certain size (because BYOND is stuck in the 16bit era).

- I've added in completely-functional nano-augmentations. Check under implantnanoaug.dm for a list of implants and implaners. As mentioned previously, they are completely functional but may be slightly OP. Among these nanoaugs are Super Strength, Psionic Radar, Electric Hands, Energy Blade/Sword Synthesizer, Rebreather, Dermal Armor, Combat Reflexes, and Regenerative Nanorobots. I won't go into detail as to what they do, but hopefully they should be self-explanitory. If not, check out their descriptions in the file previously mentioned.

- Added in a future traitor item, the Mind Batterer. Along with it a new .ogg file.

- New telecomms bus mainframe sprite, thanks to WJohnston.

- New holdable shield, sprites courtesy of Muncher (i had to mangle the side sprites because of a technical little issue. I'll change it back to the original soon). It can be retracted and expanded. Probably only going to be given to traitors.

- A couple of minor bugfixes here and there, along with some code tidying.


Hope this isn't too large a commit. I intended it to be MUCH larger, but I've decided to split up my Traitor Factions expansion into smaller commits.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3692 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-29 03:16:47 +00:00
Erthilo
a7dd312b3e TG: - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern
whether an item can or can't be placed in a certain inventory slot. See setup.dm
for information on the flags. These flags only affect humans tho, as humans are
the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross
them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's
perspective.
Revision: r3659
Author: 	 baloh.matevz
2012-05-28 22:58:57 +01: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
cib
0799cddb4b Cleanup of all the update_clothing() calls.
Mostly I replaced them with rebuild_appearance() or update_body_appearance() where suitable.

I also reorganized the new update_clothing() code a bit.
2012-05-27 20:43:52 +02:00
Albert Iordache
1671021a8d Merge pull request #1172 from Erthilo/master
Bug fixes and new portalathe sprite
2012-05-26 22:04:43 -07:00
Erthilo
2f303de9b5 New portalathe sprite, thanks to dezzmont and Furlucis. 2012-05-26 23:58:13 +01:00
unknown
22bc66f963 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-05-26 18:55:44 +03:00
Albert Iordache
783349e8c7 Merge pull request #1153 from SkyMarshal/CoolTweaks
Added some SQL stuff from oldcode.  Someone should look this over.
2012-05-25 23:10:17 -07:00
baloh.matevz@gmail.com
c2c7a3bcda - Variable declaration standardization. Big commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3671 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 19:26:36 +00:00
cib
4e79302e4b Disease changes.
- Removed all emote symptoms.
- Cleaned and organized the file.
- Added vomit and blood loss symptoms.
2012-05-25 19:11:26 +02:00
baloh.matevz@gmail.com
18ccabb33a - Removed support for the ONBACK and ONBELT flags.
- Replaced them with a whole range of inventory slot flags. These now govern whether an item can or can't be placed in a certain inventory slot. See setup.dm for information on the flags. These flags only affect humans tho, as humans are the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's perspective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3659 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-25 07:38:36 +00:00
cib
0616ccd7ed Robot limbs now can't be broken by disease. 2012-05-24 23:49:52 +02:00
SkyMarshal
7e92be62ae Added some SQL stuff from oldcode. Someone should look this over. 2012-05-23 16:03:46 -07:00
Erthilo
a4686e9cff HUD Update
TG: - User interface updates.
Revision: r3646
Author: 	 baloh.matevz

TG: - Added a character setup option which allows you to pick between the Midnight,
Orange and Old icon sets for the user interface.
- Deleted most of the unneeded icons from screen1_Midnight.dmi Use that as the
reference for making new icon sets.
Revision: r3647
Author: 	 baloh.matevz
2012-05-23 22:58:52 +01:00
Erthilo
160baf3754 Fixes police tape being placed through windows. 2012-05-22 00:16:31 +01:00
Erthilo
b7b33fc91a /obj/item/weapon/spacecash change to /obj/item/weapon/money
Can now split and stack money properly.

Fixes genetics/research access door and also money path changes.
2012-05-21 23:56:48 +01:00
Erthilo
d8a2e17f3a Hotfix for Tajarans. Reverts tajaran.dm. Guess blend doesn't work there. Also prevent skin change workaround. 2012-05-21 12:31:33 +01:00
caelaislinn
b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-21 17:48:12 +10:00
caelaislinn
98c0cfeb22 probably fixed merge conflict, also updated Antiqua.dmm
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-21 17:44:01 +10:00
Erthilo
eb599dd33a Merge pull request #1119 from SkyMarshal/BugFixes
Bug fixes
2012-05-20 14:42:30 -07:00
SkyMarshal
c8faf93e9f More Tajaran fixes, made blood-type damage not affect changelings, blood now regenerates. 2012-05-20 13:38:20 -07:00
Erthilo
56db1fdff8 Adds Soghun/Tajaran whitelisting. Stick key and race into alienwhitelist.txt like so 'byondguy - Soghun' to allow soghun, etc. 2012-05-20 20:51:38 +01:00
SkyMarshal
0cebc4d1f2 Merge pull request #1116 from SkyMarshal/BugFixes
Fixes Tajaran Transformation.  Few sanity checks and bugfixes added.
2012-05-20 12:43:30 -07:00
Erthilo
f20e61b4ae Merge branch 'master' of github.com:Baystation12/Baystation12 2012-05-20 20:33:44 +01:00
SkyMarshal
69b6926293 Fixes Tajaran Transformation. Few sanity checks and bugfixes added. 2012-05-20 12:32:00 -07:00
Erthilo
56203680d9 Missed a list of AI verbs. Engineering jumpsuit whitespace eliminated. Half fixes holopads. You can use them, you can't move. Nutriment made less ridiculously healing. Player Mute OOC name change to be more clear. More AI camera fix. Small Tajaran examine text fix. 2012-05-20 20:09:23 +01:00
CIB
17372eab8e Merge pull request #1111 from caelaislinn/da65f852b6595afe6ece0400cb2d6e8c4d4da326
antiqua updates, numerous misc changes
2012-05-20 07:16:32 -07:00
caelaislinn
79cb750130 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/WorkInProgress/AI_Visibility/_old_AI_Visibility.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-20 22:28:18 +10:00
caelaislinn
4ffbf02569 lowered radsuits from 4 to 1 per crate
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-20 22:26:01 +10:00
caelaislinn
da65f852b6 - power monitor: a remote monitoring device to send network data to a console
- lowered the number of radsuits per crate down to 1 (they're never used on exodus anyway)
- tweaked turbines

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-05-20 22:18:26 +10:00
Uristqwerty
4d86655791 Minimap works correctly with Z levels now. 2012-05-20 03:46:37 -04:00
Uristqwerty
1b0f9daf99 Continuing...
Moved some code around
Removed some unneeded lines
Actually compiles (A #define from the previous commit was in the wrong file)
2012-05-19 13:31:05 -04:00
Uristqwerty
6ff7a6c0e8 AI Visibility cleanup
First commit:
 - Splitting files
 - Starting to add comments describbing the purpose of various procs
2012-05-19 11:07:49 -04:00
caelaislinn
1587ad0abc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-19 20:00:05 +10:00
CIB
165ddcb414 Merge pull request #1096 from Uristqwerty/Minimap
Minimap
2012-05-19 02:07:26 -07:00
CIB
11045b71bb Merge pull request #1097 from Erthilo/TGUpdates
TG Updates r3603 to r3615
2012-05-19 02:03:09 -07:00
Uristqwerty
b6e4da901a Things are more complicated than they seemed at first...
... but I think I got it.

Also fixed (hopefully) a number of other AI viewing bugs.
2012-05-19 02:23:37 -04:00
Uristqwerty
36be326da7 This might fix Issue #1048 2012-05-18 22:27:26 -04:00
Erthilo
f76addd642 TG: - Removed hat storage.
Revision: r3608
Author: 	 baloh.matevz

TG: -Added missing door assemblies and associated sprites
Revision: r3609
Author: 	 ericgfw...@hotmail.com
2012-05-19 01:41:04 +01:00