Commit Graph

7166 Commits

Author SHA1 Message Date
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
Malkevin a8df5726c3 Merge branch 'master' of https://github.com/tgstation/-tg-station into capcarapace 2013-04-22 22:48:03 +01:00
Cheridan f48a22a6c8 -changes the deductcharge proc again to get rid of my silly hack. 2013-04-22 15:32:00 -05:00
Cheridan d82bb638e4 -Fixes me not using the appropriate setter procs for cell charge. 2013-04-22 14:32:46 -05:00
Giacomand f14f733a41 New suicide_act for C4 which blows up the user and makes them say a catchy phrase depending on their role. 2013-04-22 19:37:11 +01:00
Cheridan d7406925a8 -Actually fixes the issues with inhands not updating. Thanks to Aranclanos. 2013-04-22 01:03:42 -05:00
Cheridan 189611e6d6 -Fixes the stuff Giacom pointed out.
-Updated some other items to use the hitsound var while I was at it.
2013-04-21 23:26:59 -05:00
Cheridan 1317ea6462 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-21 18:58:26 -05:00
Aranclanos 77181c5514 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-21 08:08:54 -03: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
Giacomand 0fe1b6c1b6 Merge pull request #403 from Petethegoat/issuefixes
Issue fixes
2013-04-20 06:16:38 -07:00
Ikarrus 571a7ec6e0 Merge pull request #396 from Petethegoat/vaultairlock
Adds the deconstructed vault airlock.
2013-04-20 05:51:27 -07:00
Tastyfish c98abbf6cf Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-19 00:44:26 -04:00
Tastyfish b5a0fbea76 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-18 15:40:35 -04:00
Tastyfish 1c3ad940f0 Re-enabled bag item count thing 2013-04-18 15:33:43 -04:00
Pete Goodfellow a691679254 Fixed poster duplication when you cut it from the wall. 2013-04-18 19:57:54 +01:00
Pete Goodfellow 75f7a529d1 Removes /obj/item/weapon/wire (it did nothing, it's not cables) 2013-04-18 19:57:24 +01:00
Pete Goodfellow 05897ca80f Standardised welders in tools.dm. Includes text styling and names. Removes redundant procs and code. Adds mob icon updates where appropriate.
Also includes a change to cable cuff removal so that the cablecuff itself is garbage collected.
2013-04-17 23:52:15 +01:00
Pete Goodfellow 0a58830354 Adds the deconstructed vault airlock. Rearranges the icon_states in vault.dmi.
Removes a duplicate sandstone door assembly.
2013-04-17 19:45:36 +01:00
Cheridan 8f02d5fee1 Commitin' the stuff that didn't merge 2013-04-16 23:13:35 -05:00
Cheridan 6731fe8b83 Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2013-04-16 23:07:35 -05:00
Cheridan c429e5883e MAKESHIFT WEAPONS UPDATE
-Removes stungloves and all related code.
-Makeshift stun batons can be made in their stead, along with spears. Spears can be thrown or used one or two-handed.
-Major stun baton revamp. They now accept batteries, which can be removed and replaced.
-Fixes the bug where you could use TK to make a dualsaber from a single saber.
2013-04-16 22:59:01 -05:00
Giacomand 657ac139d2 Merge pull request #351 from Petethegoat/cuffsound
Cuffs now play the sound when they're first used, not when they're finished
2013-04-16 15:36:17 -07:00
Pete Goodfellow d832bd268a Merge pull request #331 from Giacomand/silentBorgAI
Non-Vocal AIs and Cyborgs configuration option.
2013-04-16 15:33:13 -07:00
Pete Goodfellow acd5d86430 Adds luminosity back to weed nodes. 2013-04-16 16:33:52 +01:00
Pete Goodfellow 5d33a7a9a1 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-16 16:25:06 +01:00
Pete Goodfellow e4bce0bb14 Replaced most reagent initialisations with the helper proc create_reagents(). 2013-04-15 15:40:33 +01:00
Ikarrus 4d0c134491 Added clipboards to Detective and Warden lockers. 2013-04-14 16:37:23 -06:00
Pete Goodfellow d4cdaa2f00 Merge branch 'master' of github.com:tgstation/-tg-station 2013-04-14 19:03:37 +01:00
Pete Goodfellow 6f43f81c05 Updating razors to reduce code duplication. Adjusts text styling. 2013-04-14 19:02:52 +01:00
Pete Goodfellow abb0f77c5d Merge pull request #353 from Nodrak/freeformlogfix
Fixes freeform module logging
2013-04-13 07:09:29 -07:00
Nodrak d7d7c070de Fixes freeform module logging from logging the player who input the law as both the uploader and the uploadee. 2013-04-13 10:06:28 -04:00
Pete Goodfellow 6c34a59aca Cuffs now play the sound when they're first used, not when they're finished. 2013-04-13 01:14:10 +01:00
Giacomand bf1d0816e2 * Updating changelog.
* Updated to latest version.
2013-04-12 23:42:45 +01:00
Ikarrus c7d99edf60 -Moved headgear and mask check up and used get_location_accessible()
-Updated skinhead sprite to be more transparent
-Updated razor sprites
-Updated Changelog
2013-04-10 21:00:15 -06:00
Ikarrus 5a49fc33b3 Merge branch 'master' of https://github.com/tgstation/-tg-station into razors 2013-04-10 20:07:40 -06:00
Pete Goodfellow 4a3c22ac70 Merge pull request #336 from Cheridan/master
Pepper Spray Update!
2013-04-10 15:20:34 -07:00
Ikarrus c19e7044d4 -Added electric razors to the prison wing, captain's office, and locker room
-Updated changelog
2013-04-09 22:45:46 -06:00
Pete Goodfellow fed03de04f Merge pull request #194 from Giacomand/href_exploit_fix
Uplink Update: Added datums for uplink items. This allows you to easily add items to the uplink in a maintainable manner.
2013-04-09 17:11:15 -07:00
Cheridan 782403ddbd Pepper Spray Update!!
-Capsaicin can be turned into Condensed Capsaicin via chemistry.
-Alters the effect of pepper spray slightly. Changes it from a paralyze(KO) to weaken(stun like batons, etc), and adds slight lingering confuse effect.
-Adds teargas grenades(pepper spray smoke chem grenades), currently obtainable in Weapons crates and Riot crates.

Supplypacks:
-Adds a roll of film to the bureaucracy crate, and made it a little cheaper.
-Removes the beanbag crate entirely, it redundant. Just print out the beanbag shells at the autolathe.
-The previously-overpacked Riot gear crate comes with 1 less set of equipment, but with more handcuffs. Made cheaper to compensate.
2013-04-09 14:58:41 -05:00
Giacomand f49bef35ba * Added a two config options which allows you to disable the AI and Cyborgs from being able to vocally speak, except for AIs using the holopad.
* Added a new proc called IsVocal(). Only used by the new system so far but it will allow you to use it to stop mobs from being vocal.
2013-04-08 21:53:41 +01:00
Giacomand 12bd728f19 * Added a manual for Virology. It spawns in Virology and it links to the "Infections" wiki page.
* New icon for the manual.
2013-04-06 16:46:05 +01:00
Cael Aislinn ed4b0859ec Merge pull request #216 from Tastyfish/master
Some violin sound file fixes and a converter for MIDIs -> piano/violin format
2013-04-04 04:41:15 -07:00
Tastyfish e4b2968e4f Cleaned up redundant piano/violin sound files and made playnote() code not be a giant unmanageable switch 2013-04-04 06:55:38 -04:00
Pete Goodfellow 7e69161221 Standardises bodybag.dm, including text styling. Updates the max name length of a label. Fixes folded bodybags not fitting in boxes. Bodybags now go into hands when folded, if possible. 2013-04-04 00:43:09 +01:00
Giacomand 26e29a44c1 Uplink Update:
* Added datums for uplink items. This allows you to easily add items to the uplink in a maintainable manner.
 * This fixes the href exploit which allowed traitors to spawn any item they wish.
 * Made the uplink interface still show unbuyable items, but grayed out.
 * After unlocking your PDA, it will return to the main menu; this will help stop metagamers.
 * Your password will be trimmed, meaning that entering "213 Alpha " will be correct and won't set it as your ringtone.
 * Replaced all the old uplink code, which is useless now.
 * Changed all the feedback procs to instead use the uplink datum's name. This is important if you are keeping track of stats.
 * Moved the bundle uplink item to the "Badass" category.
2013-04-02 01:02:54 +01:00
Cael Aislinn 861084061e Merge pull request #167 from Petethegoat/implantdiskfix
Cavity implant disk fix, steal objective finding fixes
2013-04-01 10:32:17 -07:00
Cael Aislinn d1db9d4abf Merge pull request #177 from Petethegoat/janicart
Replaces the janicart with the janitorial cart.
2013-04-01 10:21:46 -07:00