Commit Graph

2702 Commits

Author SHA1 Message Date
Pete Goodfellow
aa3efe20d6 Here's the proper cable.dm 2013-04-30 16:32:07 +01:00
Pete Goodfellow
9343a93820 Reverting stray changes from my merge of #464 2013-04-30 00:06:30 +01:00
Cheridan
e4bccfc229 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Conflicts:
	html/changelog.html
2013-04-29 14:39:25 -05:00
Ikarrus
e7bcf2dbfc Part one is here: #450
This pull request adds the box of medals to the map (Captain's Office), as well as updating the changelog.html

Also includes minor string and sprite fixes.
2013-04-27 18:43:05 -06:00
Ikarrus
b34c18ce3d Select Equipment update
-Renamed 'Strip' to 'Naked'
-Added Assistant
-Re-added Death Commando
-Added job titles to IDs of figures who should have it displayed. Shortened the titles of some of them so it wouldn't make ID and PDA names too long.
2013-04-27 09:37:06 +10:00
Ikarrus
eabfef6933 Changed stand_icon to face_standing so update_body won't have to be used to clear it.
Used update_hair(0) instead of update_hair()
2013-04-27 09:35:43 +10:00
Pete Goodfellow
c72bb4aac8 Cable coils now update mob inhands correctly when used up. Changed cable coil items to use the existing update_icon() proc, instead of their own updateicon(). 2013-04-27 09:32:50 +10:00
Tastyfish
a77e4a8e9e Fixed the robot sight modules, eg mesons not clearing on death. 2013-04-27 09:31:56 +10:00
Ikarrus
d1044dff99 A fix for a runtime that would occur if you tried to re-brain a monkey. 2013-04-27 09:31:55 +10:00
Ikarrus
0c66899053 Placing a brain back into a human calls update_hair(). They will look bald. 2013-04-27 09:31:45 +10:00
Pete Goodfellow
c87868b274 Moves /obj/effect/alien to /obj/structure/alien. Does not update the map.
Moves /obj/effect/alien/acid to /obj/effect/acid. Adds a new sprite for acid.
Standardises and updates text styling in code/game/objects/effects/aliens.dm.
2013-04-27 09:30:21 +10:00
Cael Aislinn
8e86150216 Merge pull request #380 from Petethegoat/effects
[MAP] Effects update
2013-04-26 05:01:41 -07:00
Cael Aislinn
ff14a8e295 Merge pull request #383 from Tastyfish/master
Machine frames, pinpointers, borgs, etc
2013-04-26 03:35:20 -07:00
Cael Aislinn
1c2328ed7c Merge pull request #401 from Aranclanos/HUDiconsRevamp
Small revamp of medHUDs and secHUDs. Fixes del() lag (this time 5real).
2013-04-26 03:20:04 -07:00
Cael Aislinn
c66b2da154 Merge pull request #444 from Cheridan/Coins!
COIN UPDATE
2013-04-26 03:12:43 -07:00
Ikarrus
ee19f2fbd7 Medals
-Added a locked box of medals to be placed in the Captain's Office. It contains medals the Captain can award his crew.
-Added pinning medals onto others, provided their jumpsuit is exposed
-Added a message when you try to add an accessory to a jumpsuit that already has one.
-Fixed up emagging lockboxes
2013-04-25 20:08:02 -06:00
Malkevin
798d537cfe Merge branch 'master' of https://github.com/tgstation/-tg-station into capcarapace 2013-04-25 15:49:42 +01:00
Carnie
7417b82546 Merge pull request #392 from Ikarrus/debrain
Debraining humans visually change their appearance.
2013-04-24 22:31:36 -07:00
Ikarrus
cc3bf1f655 Changed stand_icon to face_standing so update_body won't have to be used to clear it.
Used update_hair(0) instead of update_hair()
2013-04-24 19:23:04 -06:00
Cheridan
82c0c39836 Hahaha remember that time when I commited code that didn't compile??
-Fixes my typo.
2013-04-24 15:25:26 -05:00
Pete Goodfellow
0b0056d740 Merge branch 'master' of github.com:tgstation/-tg-station into effects 2013-04-24 16:41:02 +01:00
Ikarrus
70818c3b09 Moved the getbrain(src) to be used with the h_style code. 2013-04-24 08:43:44 -06:00
Carnie
a8fb18f937 Merge pull request #443 from AndroidSFV/Flux2
Energetic Flux event added to secrets panel
2013-04-24 02:28:28 -07:00
carnie
4d2c791a33 Modification to Pete's commit.
var/list/type/subtype/L -> var/list/L
2013-04-24 04:07:41 +01:00
Pete Goodfellow
62b848c6ce Removes equip_e - Fixes #423
This updates everything that used equip_e, particularly the strip panel, but also DNA injectors and CPR.

Removed unused mob vars:
 var/obj/effect/organstructure/organStructure
 var/other
 var/proc_holder_list[]

Removed unused alien suit and head slots.
 Removed var/obj/item/weapon/card/id/wear_id from monkeys, and updated ed209s to not use :

Renamed HUMAN_STRIP_DELAY to STRIP_DELAY.

Muddled Topics() around so that mobs are now a bit more OO. Also updated quite a few misc inventory procs to various degrees.

Updated monkey and aliens huds a little bit.

Random movement when confused now happens half the time.

Fixed monkey breathmask onmobs.

Added a .unconscious text style, for that nice bold blue text you get when you're unconscious. Only CPR uses it at the moment.

This has been tested fairly extensively, and everything seems to work fine.

-Merged commits ~carnie
Signed-off-by: carnie <elly1989@rocketmail.com>
2013-04-24 04:07:39 +01:00
Cheridan
46920eeb39 COIN UPDATE
-Removes the unused/dumb access stuff from space cash.
-Fixes a bug where dice would vanish if you used a hand labeller on them.
-Moves space cash/coins/mint sprites into their own file, economy.dmi. Moves mineral sheets into mining.dmi.
-Coins are flippable! Features unique flipping sprites and sound effects, and two-headed coins.

-Oh and better sprites for wooden closets too.
2013-04-23 19:50:05 -05:00
Giacomand
a3a615b1c0 Merge pull request #428 from Petethegoat/misc_changes
Sprite update and minor fix
2013-04-23 11:45:03 -07:00
AndroidSFV
9063eaf9f4 -Makes the Energetic Flux event admin trigger-able via the secrets panel. 2013-04-23 12:15:26 -05:00
Pete Goodfellow
ed0f46eaec Merge pull request #435 from errorage/master
Library table update.
2013-04-23 09:47:16 -07:00
Malkevin
99e69fb87f Changed the description to something more fitting of a thing that isn't a TMNT reference 2013-04-22 23:27:15 +01:00
Malkevin
a8df5726c3 Merge branch 'master' of https://github.com/tgstation/-tg-station into capcarapace 2013-04-22 22:48:03 +01:00
Cheridan
1317ea6462 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-21 18:58:26 -05:00
errorage
8a8a516773 - Updates library table definition
- Adds a ckey and datetime column to the library table so we can finally see who is uploading all the exploitive books.
2013-04-21 19:35:42 +02:00
Tastyfish
208255be6b Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
	code/modules/power/cable.dm
2013-04-21 00:42:18 -04:00
Malkevin
8eea45c917 Since the captain doesn't spawn in his armor suit anymore I was finding it hard to tell him apart from the HoP at a glance, so I made a new armored vest just for him.
-Created Captain's Carapace item
-Made sprites for the new item (this is my first attempt at spriting, be gentle)
-Swapped the armor the captain spawns in and that in his locker to the new carapace item

https://dl.dropboxusercontent.com/u/95696802/Commits/tortlepowa/carapace.png

Additional minor edits:
-Added flashlight and t-ray to Hazard's vests equipables
-Added Pepperspray to detective coat's equipables (amazing no one noticed this before... heh)
-Copied Detective Coat's equipables over to the Detective's Vest
2013-04-21 05:28:46 +01:00
Pete Goodfellow
e0de2d9bd2 Fixed the legcuff update icon. It was adding both the lying and standing overlay whenever it was called. 2013-04-21 04:28:21 +01:00
Giacomand
b9451f7153 Merge pull request #408 from p440/master
onetankbomb fixes
2013-04-20 06:21:07 -07:00
Giacomand
0fe1b6c1b6 Merge pull request #403 from Petethegoat/issuefixes
Issue fixes
2013-04-20 06:16:38 -07:00
Giacomand
509e8db043 Merge pull request #395 from Malkevin/CEFireResist
CE with firesuit protection enabled sans other changes
2013-04-20 06:12:03 -07:00
Giacomand
6669148bb7 Merge pull request #399 from AndroidSFV/master
'State Laws' verb for Cyborgs
2013-04-20 06:10:49 -07:00
Giacomand
df245eec30 Merge pull request #352 from Aranclanos/ShuttleCall
Automatic shuttle calls 2 the electric boogaloo
2013-04-20 05:34:40 -07:00
AndroidSFV
2cb0f54312 Recommended changes to silicon State Laws 2013-04-19 12:09:39 -05:00
AndroidSFV
7afcc7e8b9 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-19 11:29:44 -05:00
Intigracy
ddd279c11d Edited the admin names in deadsay.dm to match with current admins, currently it's reeeaaallly out of date.
Special thanks to everyone who helped come up with the names!
2013-04-18 22:03:03 -07:00
Tastyfish
c98abbf6cf Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-19 00:44:26 -04:00
p440
8411e041b3 onetankbombs not passing stuff to bombassemblys
infra sensors not checking locs high enough up the hierarchy for onetankbombs (and potential future things)
2013-04-18 21:15:56 -07:00
Ikarrus
7895ad590e Fix for runtime when debraining a mutantrace human. 2013-04-18 20:53:58 -06:00
Cael Aislinn
1639756136 Merge pull request #386 from Incoming5643/buzz
Gives fly people a buzz lisp (lengthens "z"s)
2013-04-18 16:49:18 -07:00
Cael Aislinn
968bafbd32 Merge pull request #393 from Petethegoat/nullscreenrun
Adds client checks to update_inv procs, before trying to reference client.screen.
2013-04-18 16:47:58 -07:00
Cael Aislinn
976f3faebe Merge pull request #394 from Petethegoat/typofixes2
Fixed a typo in human_defense.dm and updated an outdated message in cyborg examine.dm.
2013-04-18 16:40:18 -07:00