Commit Graph

26 Commits

Author SHA1 Message Date
Fox-McCloud 74bb52d48e Cleans Up Icons 2015-07-06 22:47:18 -04:00
Fox-McCloud a8ead35ea5 Fixes Blob Zombies 2015-05-07 17:35:43 -04:00
Fox-McCloud 03c7a72a33 Undershirts 2015-01-05 16:22:47 -05:00
ZomgPonies 1f7cc2cbfb New undershirts 2014-06-20 12:17:57 -04:00
DJSnapshot 843ac65077 Undershirts and rolling down jumpsuits!
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	icons/mob/human.dmi
	icons/mob/uniform.dmi
2014-04-19 16:17:14 -04:00
ZomgPonies 242a400ef8 Laying down is now a transform, so cleaning out unused icons 2013-11-06 16:30:37 -05:00
ZomgPonies 213384a438 Updated zombie dmi 2013-11-05 08:18:22 -05:00
cib fb60301594 Revert "Revert's cib's BS12 merge by XSI's orders"
This reverts commit a6e7c085ef.

Conflicts:

	baystation12.dme
	code/datums/organs/organ_external.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/mob_defines.dm
	code/setup.dm
	icons/mob/dam_human.dmi
	icons/mob/human.dmi
2012-10-11 14:31:31 -07:00
polyxenitopalidou@gmail.com 9f020e76e7 •Added skeletons
•Only usable through the admins' view_variables as of now, since no actually good ways of implementing them came up
•makeSkeleton() is still there, ready to be used wherever you wish.
•Note: Skeletons have no underwear and no eyes.
•Rewrote some minor stupid shit

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4800 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-02 22:29:13 +00:00
quartz235@gmail.com a6e7c085ef Revert's cib's BS12 merge by XSI's orders
- Tested with various damtypes/locations/mobs but if i'm a dumbass and overlooked a problem feel free to punch me and revert this

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4762 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-27 02:14:21 +00:00
petethegoat@gmail.com c016c10bfa Fixes issue 955. (Signalers don't update bomb overlays)
Fixes issue 957. (Sexy mime costume causes incorrectly coloured cleavage)

Adds lipstick~
There are four colours to choose from, and they can be found in contraband crates. You can wipe off lipstick with paper.

Adds some feedback for when the invisimin verb is used.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4739 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 15:31:01 +00:00
CIB123 d6dfd49a75 Ported parts of the BS12 organ system.
This includes:
- Individual wounds
- Dismemberment
- Bone breaking

It also adds configuration values to config/game_options.txt to control the point at which bones break and limbs are cut off.

Does not include surgery or bleeding yet.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4720 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 21:32:39 +00:00
elly1989@rocketmail.com e517e27554 This commit is a load of pants.
Credits to PowerfulStation devs for a few of the sprites which are not made by myself. Credits to Cheridan for the kinky stuff.

Minor runtime fix where target was becoming null...somehow.

Moved unused dmis into the icons/unused directory. They won't even be searched through if you are using resources.dm and have 'dream-maker > build > preferences > Automatically set FILE_DIR' off.
Should save a megabyte or two from the resourcefile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3835 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-15 23:16:05 +00:00
elly1989@rocketmail.com 51ed49d4f7 Derp SVN didn't commit any of the iconfiles for the update_icons commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3816 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-14 02:14:53 +00:00
petethegoat@gmail.com 537e922249 Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3584 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-12 15:03:02 +00:00
johnsonmt88@gmail.com 6951ec37ed Committed for Sieve:
Reverted dismemberment
- This is the majority of the files

Reverted the gun change
- You wont shoot yourself putting your gun away
- You don't have to fire off all of your shots before hitting someone with your gun

Reverted Tarajans
- As requested

Hotfix for the Holodeck.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3574 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-11 02:21:00 +00:00
VivianFoxfoot@gmail.com 4dfe439b1a Adds BS12 dismemberment. Not all features of it are implemented yet, but it should be equal to our previous system.
Adds greater changeling code, but doesn't change the genome count yet on it. 
Renames registered to registered_name on IDs because bs12 had it and it seemed like a good idea to do last night.  For some reason.   
Adds an afterattack to mobs that can be used.  (In fairness, lots of shit in attack_hand should be in there instead, like stungloves and stuff, to minimize duplicated code)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3537 316c924e-a436-60f5-8080-3fe189b3f50e
2012-05-01 15:33:29 +00:00
d_h2005@yahoo.com 921050b892 Sprite Replacements: New Cultist notification icon.
Sprite Additions (Needs code):
Wooden Bucklers, to be made from tower cap wood.
New set of sexy underwear for females.
New set of sexy underwear for males.

Dragon dildoes in 7 colors okay just kidding

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3327 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-20 01:50:28 +00:00
petethegoat@gmail.com a3c9a4cf21 Added directionals for husks.
Added Khodoque's improved bucket and wallet sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3299 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-15 17:33:39 +00:00
noisomehollow@lycos.com d7dd64a427 Fixed female/male side sprites missing some pixels.
Updates to deathsquads (now have mind and spawn message).
Updates to the re-spawn command, including mind and some minor corrections. Still WIP but getting better.
Minor changes to CentCom.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@680 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-21 01:15:46 +00:00
noisomehollow@lycos.com ca41b444f3 Map Changes:
Fixed AI Satellite. Turret controls are aligned properly now, several cameras re-added.
Switched Warden and HoS areas; they are now properly attached to their respective offices thanks to AtomicTroop.
Nuke Storage now has access to maintenance.
Air alarm map fixes thanks to Blade_.

Icon Updates:

Color adjustment on riveted walls.
Updated decal sprites acquired from a Russian SS13 build (with permission).
Alien meatspike sprite updated.
Fixed plague doctor gas mask in clothing code. Probably requires further revision.
Removed kobold.dmi from obj. Empty file.
Removed kobold.dmi from mob. Copy of sprites in mob, mob.dmi.
Removed techpriest.dmi as the actual sprite is contained in robots.dmi.
Removed sectoid.dmi from mob. Moved sprite to xcomalien.dmi.
Removed golems.dmi from mob. Moved sprites to misc, old_or_unused.dmi.
Removed junk.dmi. Moved sprite to misc, old_or_unused.dmi.
More updated female sprites.
Better female underwear sprites acquired from a Russian SS13 build (with permission). Modified to fit new female base models.

Icon Additions:

Added female AI Hologram and holopad (mob/mob.dmi and obj/stationobs.dmi).
Added elevator door (obj/doors/Doorele.dmi).
Added space ninja gear. 
Facepalm display acquired from a Russian SS13 build (with permission).
Awesomeface AI display added.
Rig mining sprites acquired from a Russian SS13 build (with permission). Added item holding sprites for the suit. Rig suit replaces space suit which spawns in Engineering.
Robocop sprites acquired from a Russian SS13 build (with permission).
ed209 sprites acquired from a Russian SS13 build (with permission). Unused at the moment.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@511 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-02 00:01:55 +00:00
noisomehollow@lycos.com 238d941c40 APC fix from last update.
Updated female base sprites.
Added female AI Hologram WIP.
Modified alien larva to have directional movement.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@504 316c924e-a436-60f5-8080-3fe189b3f50e
2010-11-29 16:56:45 +00:00
polyxenitopalidou 9206af6b49 Fixes, now with 100% less compilation errors.
I love you guys

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@77 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 22:49:29 +00:00
Skiedrake 78fc52ef11 Merge to main from the hydroponics branch r57_skie_1.
Hydroponics update + bugfixes.
Consists of revisions: 
R58, R60, R67, R68, R73.


Combined changelog (from oldest rev to newest):

Put all hydroponics defines into one .dm file
Added functionality for nettles and made all currently growable plantlife work
Changed hydroponics layout
Added Hydroponics Supply crates and added weed/pest sprays into the current ones
at hydro
Fixed nettle hold graphics
Fixed vending machines showing hidden items.
Added Research Director hydroponics access and botanists tox access (already had
chem access, but no tox).
Hydroponics in great shape. Spank Numbers for final modifications before merging
to trunk. (weedkillers, pestkillers)
Added a seed vending machine.
Amanitas now poison, and the poison is nasty. Added a poison() proc to all
foods.
Added graphics for vertical and horizontal one-tile-wide tables. Put one inside
hydroponics.
New 'blur' texture when your vision goes blurry.
Fixed a typo in hydroponics code.
Added a disposal unit in hydroponics.
Added a how-to instructions paper in hydroponics.
Hydroponics in working order. Extra features still in developement.
Fixed weedspray and pestspray entries.
Removed chaplains random probability to have see_invisible 15 at start, because
it's reset to 0 right next world tick anyways.
Added burn() and drug() procs to foodstuffs.
Added drug effects to some mushrooms. Have a nice trip.
Made chilis heat you up and ice peppers freeze you down.
Fixed carrot's harvest icon (it didn't exist)


To-do: Mutagens and vitamins for hydroponics plants.
New mutations, recipes for cook, extracting stuff from plants.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@74 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-07 19:33:23 +00:00
polyxenitopalidou f8b4e2d2ad Final fix for meatbread and omelette making, better tray icon, new fatguy west+east icons, brb making the rest of the fatguy decals. A bit of work, sure, but im sure it can be done in a day or two
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@65 316c924e-a436-60f5-8080-3fe189b3f50e
2010-09-06 10:31:58 +00:00
only.lurking 662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00