Commit Graph

1713 Commits

Author SHA1 Message Date
Ikarrus
cdd678cc77 Merge branch 'toolboxing' of https://github.com/Ikarrus/-tg-station into toolboxing
Conflicts:
	html/changelog.html
2013-05-13 08:35:59 -06:00
Ikarrus
155f0817bf Merge branch 'master' of https://github.com/tgstation/-tg-station into toolboxing
Conflicts:
	html/changelog.html
2013-05-13 08:34:19 -06:00
Pete Goodfellow
20a933e00a Merge pull request #545 from Cheridan/radios
RADIO SPRITES UPDATE
2013-05-12 07:19:35 -07:00
Malkevin
164ce9a02e Fix for missing in-hand sprites for orange id cards 2013-05-11 23:15:37 +01:00
Ikarrus
c333680f28 -Added high-visibility orange ID card icon for prisoner IDs
-Fixed the hud icon not showing up for prisoners
2013-05-11 15:22:52 -06:00
Ikarrus
96b1bd81dd Reduced toolbox force to 10 2013-05-11 11:44:52 -05:00
Malkevin
8e32c007ed Made the new prisoner ID box a parent of /box instead of /box/ids, 2013-05-11 17:32:11 +01:00
Malkevin
26cf12cf1a Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonercards
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-05-11 17:18:34 +01:00
Ikarrus
2f2b2abb63 Reduced toolbox force to 11 2013-05-09 17:27:33 -06:00
Cheridan
4fa62c6151 -Radio update addendum: Made encryption keys tiny items.
-Fixes an issue with table sprites.
2013-05-09 16:31:24 -05:00
Cheridan
3ce06dea8a RADIO SPRITES UPDATE
-New sprites for about half of the headsets:
-Cargo headset now tan instead of white, science now has a unique headset instead of using the command headset sprite (wtf?), medical headset center changed to green from blue. New sprite for medsci headsets.
-Command, centcomm, & basic headsets tweaked a bit, with better shading.

-Made descriptions for command headsets less bad.
2013-05-09 15:25:56 -05:00
Ikarrus
0ee89e9cd2 Increased toolbox force to 12 2013-05-07 21:13:13 -06:00
Ikarrus
861798c270 Removed extinguisher change 2013-05-07 21:12:01 -06:00
Malkevin
f53202e158 Added a box of prisoner ID cards to the perma wing
Aside from further dehumanizing criminal scum this also serves as a way of correcting the annoying behavior of suit sensors and crew monitoring computers, and chemical implants: if someone isn't wearing an ID card (which prisoners will likely have taken from them) they show up as an Unknown.

Also included a sec hud icon for the prisoner 'job'
2013-05-08 01:09:32 +01:00
Ikarrus
0e0622dc12 Raised toolbox force to 10
Reduced extinguisher force to 5
2013-05-06 22:12:28 -06:00
Cheridan
a6c3f4a78d Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-05-04 13:04:47 -05:00
Cael Aislinn
f0a51af7f4 Merge pull request #499 from Giacomand/ministation_merging1
Closet Cleanup and Bins.
2013-05-03 21:57:53 -07:00
Cael Aislinn
2f57c45e76 Merge pull request #478 from Malkevin/meltablefloortiles
Recyclable floor tiles
2013-05-03 21:16:10 -07:00
Giacomand
35f6a979bc * Small fix for closets picking up anchored items.
* Made closets/crates pick up on their turf during initialization.
2013-05-04 05:07:36 +01:00
Aranclanos
74fb61eeee Merge pull request #463 from Ikarrus/reactive
[MAP] Reactive Armor as objective
2013-05-03 19:24:58 -07:00
Malkevin
3d1a96975f reverting last commit.
Wt.remove_fuel is 0 for a reason
2013-05-04 02:07:20 +01:00
Malkevin
f8fa1fce09 Welding rods/shards/floortiles now costs welderfuel 2013-05-04 01:44:31 +01:00
Giacomand
77b0fce80f * Fixed a typo. 2013-05-04 01:10:32 +01:00
Giacomand
b4229b0b24 * Fixed an accidental commit. 2013-05-03 22:42:12 +01:00
Giacomand
343bfe90b2 This commit was made to help increase the compatibility between MiniStation and /tg/station.
* Restructured closets to be easier to add new features.
 * Added trash bins that you can hide in.
 * New sound effects for the bin, they are royalty free.
 * Personal lockers can now be (un)locked with your PDA/Wallet/Whatever.
2013-05-03 22:32:17 +01:00
Cheridan
5f933e2d3e Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-02 11:53:30 -05:00
Cheridan
725718dd5b -Replaces the holodeck boxing ring that no longer works with a dodgeball arena. Adds dodgeball sprites and defines.
-Fixes the crew monitoring console disappearing when damaged (meant to do this before but the change didn't go through somehow)
-Readds the space piano, removes the useless /device subtype from its path.

-Makes tables use a less hardcoded method to determine iconstate.
2013-05-02 11:52:55 -05:00
Malkevin
5cef64f237 Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles
Conflicts:
	html/changelog.html
2013-05-02 15:07:33 +01:00
Cael Aislinn
474722d425 Merge pull request #447 from Carn/DNArework
Resolves #283
2013-05-02 05:46:44 -07:00
Cael Aislinn
29cd502c8b Merge pull request #440 from Giacomand/c4_act
New suicide_act for C4
2013-04-30 04:56:19 -07:00
carnie
ae00173037 Merge branch 'master' of github.com:tgstation/-tg-station into pr/447 2013-04-30 04:07:28 +01:00
Malkevin
a010b11b83 Recyclable floor tiles
Adds the code to weld floor tiles together to make sheets, just like rods except it takes 4 tiles instead of 2 rods.
2013-04-30 02:59:20 +01:00
Ikarrus
a3f51ecbeb Adds the RD's reactive armor to possible steal objectives.
Reactive armor now spawns in the RD's locker.
Replaced some tables with racks in the RD's office.
2013-04-27 18:35:12 -06:00
carnie
fea2fc3fef Fixes for admin-spawned dnainjectors: repeat_string has been simplified (it wasn't making NULLED_SE and NULLED_UI to the correct size).
Fix for Overpowered mutations (HULK and TELE) not manifesting. A typo was the cause.
Admin-spawnable injectors always succeed. This code already existed (I believe this is how they used to function), but it did not work as the argument was not passed correctly. This also removed snowflake code for the darkbundle telemut injector.

Thanks to Giacom, wouldn't have found these without him.
2013-04-27 06:40:17 +01:00
Cheridan
6bc2d76003 SPRITE UPDATE & FIXES
-Fixes a bug with the crew monitoring computer vanishing entirely when broken.
-Fixes a bug with baton rechargers not displaying properly when the baton is fully charged.
-Adds a define for a decorative item for the RD's office. :)

-New sprites for mining lanterns, telescreens (with directionals), directionals for noticeboards, and a service bell. Ding ding!

-Deletes plasma.dmi, which was unused. The plasma tile overlays that are used are in tile_effects.dmi.
2013-04-27 00:40:00 -05:00
Aranclanos
a749023328 Same crap, for the fourth time.
Created a new subtype from radios, /obj/item/device/radio/bounced They have no difference except from spawning with their speakers off.

The only reason is to reduce in a 30% the amount of loops in the general channel chat lag.
2013-04-27 09:33:47 +10:00
Tastyfish
ba8d379013 Re-enabled bag item count thing 2013-04-27 09:32:51 +10:00
Pete Goodfellow
53923b4d60 Adds luminosity back to weed nodes. 2013-04-27 09:30:22 +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
b8c5854293 Merge pull request #433 from Aranclanos/WhyGitWhy
[MAP] Bounced radios start off to help the lag. Created a new subtype for them.
2013-04-26 03:30:17 -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
Pete Goodfellow
0b0056d740 Merge branch 'master' of github.com:tgstation/-tg-station into effects 2013-04-24 16:41:02 +01:00
carnie
043028db83 Resolves #283
DNA modification uses normally distributed random numbers. Radiation strength dictates the standard deviation of the change in the hex character which is hit (higher output means greater chance for a large change) . Similarly, radiation duration dictates how likely we are to hit the hex-character we clicked on (longer duration means more likely to hit). Irradiation is strength*duration. All balancing is done via multiplier defines so you can rebalance it easily.

DNA blocks and structuring all use defines. Making modification/expansion easier. I'll likely expand this into a datum-based system to allow more interesting features, reduce code further and allow admins to interact with the way dna strings behave.

DNA strings can be spliced together using merge_text().
 e.g. string 1: "Hello World"
 string 2: "Seeya______"
 result: "Seeya World"
 This isn't used except for admin-spawnable SE injectors at the moment.

r_hair, g_hair, b_hair, r_facial, g_facial, b_facial, r_eyes, g_eyes, b_eyes were removed and made into 3 short hex-colors.

Skin tones now support colours other than shades of brown. I've had to restrict it heavily until other stuff is done. Skin tones include Albino Caucasian, Oriental, Mediterranean, etc.

Data disks and DNA injectors were reworked to use associative lists so transferring data is just a matter of doing list.Copy()

var/dna is now defined at /mob/living/carbon level. Only monkeys and humans may have dna currently. Support is there for all carbon-based lifeforms to have dna.

DNA modifier console has almost all controls on one screen.

UIs and UEs can be injected separately (appearance and name, respectively)

dna helper procs like ready_dna() and such were changed to make them more versatile. There is now a hardset_dna() proc as an alternative to ready_dna which can initialize dna with properties passed into it or update an existing dna string (useful for cloning and antag spawning)

Every block of SEs are in randomised positions.

Disabled automatic logging of world.log, as it produced undesirable behaviour.

Mr Muggles and God Emperor of Mankind disks removed.

Floor() removed. (it was completely uneccesary, that is what round() is).

Fixed spelling mistakes in modularchangling.dm (thanks tenebrosity)

Tanning removed from beaches (again)

Experimental: monkeys and humans do not have dna until first attempt to read dna (using check_dna_integrity(mob))
This is mainly due to the way everything is hardcoded into New().

Changelog.html updated
Signed-off-by: carnie <elly1989@rocketmail.com>
2013-04-24 09:37:30 +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
d140310251 Changed the default shout. 2013-04-23 10:46:39 +02:00