Commit Graph

7174 Commits

Author SHA1 Message Date
Giacom 90ecfcbc4b Merge pull request #2063 from Nienhaus/master
Posters
2013-12-21 13:37:20 -08:00
Cheridan e3f82955e4 Merge pull request #2080 from Razharas/no
Fixes morgue trays used by ghosts and what not
2013-12-21 01:12:04 -08:00
Cheridan 20a57b9917 Merge pull request #2030 from KazeEspada/gunhardest
Gun HARDEST!
2013-12-20 23:18:55 -08:00
Cheridan 046714d864 Merge pull request #2092 from Giacom/grab_monkey
Monkeys no longer wander off when being pulled or grabbed.
2013-12-20 11:44:25 -08:00
Cheridan a03c5ba388 Merge pull request #2081 from Razharas/brakes
Fixes trunks being unwelded while under machinery
2013-12-19 22:31:32 -08:00
Cheridan e44e31f8c9 Merge pull request #2077 from Razharas/fix
Fixes soil being wrenchable
2013-12-19 22:05:47 -08:00
Cheridan 0f016a054f Merge pull request #2078 from Razharas/train
Fixes chameleon projector
2013-12-19 21:54:17 -08:00
Cheridan 891d5e37f8 Merge pull request #2079 from Razharas/has
Fixes beepsky stunning people in things
2013-12-19 15:03:19 -08:00
Aranclanos 0fdcd42592 Merge pull request #2054 from Cheridan/Nuke
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
Giacomand c917999f2f * Monkeys no longer wonder off when being pulled or grabbed.
* Fixed the grabbed_by list not being emptied when the grab is deleted.
 * Removed duplicated use of grabbed_by.
 * Undef'd defines which are only used in a single file.
2013-12-19 20:41:19 +00:00
Giacom a864158f74 Merge pull request #2068 from Aranclanos/GiaYouGiganticFaggot
hand labelers on pill bottles fix.
2013-12-19 11:56:01 -08:00
Giacom 9bede23a24 Merge pull request #2075 from Razharas/The
Fixes facial hair styles not working properly
2013-12-19 11:53:45 -08:00
Cheridan fbe24b46ac Merge pull request #2071 from Giacom/viro_streamline
Virology Feedback Tweaks
2013-12-19 10:51:08 -08:00
Cheridan 8ba3859b2d Merge pull request #2069 from Aranclanos/pAIBioscan
pAI bioscan runtime fix
2013-12-19 10:41:07 -08:00
Razharas 1a2553dc33 This wasnt supposed to be deleted 2013-12-19 00:46:10 +04:00
Razharas 691ea75b45 Fixes trunks being unwelded while under machinery 2013-12-19 00:38:14 +04:00
Razharas 1ce0b11b0d Fixes morgue trays used by ghosts and what not 2013-12-19 00:23:36 +04:00
Razharas 5f459cd834 Fixes soil being wrenchable 2013-12-19 00:08:48 +04:00
Razharas 5dffd2cfe9 Fixes beepsky stunning people in things 2013-12-19 00:04:19 +04:00
Razharas bce9e5d826 Fixes chameleon projector 2013-12-19 00:01:59 +04:00
Razharas 76e32f1e1f Fixes facial hair styles not working properly 2013-12-18 23:37:09 +04:00
Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff
Resolved Conflicts:
	code/modules/projectiles/projectile.dm
2013-12-18 18:27:22 +00:00
Giacom 514ced7e76 Merge pull request #2061 from Aranclanos/OnlyHumanAndMonkeys
Changeling verbs runtimes/bugs on different mob types fix.
2013-12-18 10:13:42 -08:00
Giacom 90972ba593 Merge pull request #2052 from Aranclanos/PhotocopierCooldown
Photocopier runtimes fix.
2013-12-18 10:12:03 -08:00
Giacom 0c03873d03 Merge pull request #2053 from Aranclanos/NOBODYLIKESNINJAS
Ninja mask runtimes fix.
2013-12-18 10:10:26 -08:00
Giacomand 8e9c5c19c8 * Set the cooldown, for creating virus culture bottles, from 100 to 5 seconds.
* Bottles spawned through the Pandemic will have a random pixel_x/y.
 * The recipe to remove a symptom from a virus (synaptizine + blood) will now only require 1 unit of synaptizine.
2013-12-18 17:33:03 +00:00
Aranclanos 0a18229abd pAIs won't runtime anymore if they try running a bioscan while lying on the floor 2013-12-18 13:12:59 -03:00
Aranclanos 7bb4cf6a79 Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles. 2013-12-18 12:25:39 -03:00
Nienhaus ab76fe339d Forgot a .
...
2013-12-18 00:11:26 -06:00
Nienhaus 70b0252797 Holy fuck English
I hate what I speak.
2013-12-18 00:10:30 -06:00
Nienhaus 47fab14f9f Very English!
I suck at spelling and grammar.
2013-12-18 00:00:15 -06:00
Nienhaus 8bf9e63966 Posters
Hey look, Posters!
http://puu.sh/5QlUx.dmi
Image
2013-12-17 23:36:56 -06:00
Aranclanos f1677efdea Merge pull request #2040 from Razharas/master
Some logging and fingerprints
2013-12-17 21:03:36 -08:00
Aranclanos 53a02296df Merge pull request #1989 from Perakp/dnaDecon
DNA scanner and cloning pod deconstruction
2013-12-17 20:44:16 -08:00
Cheridan f6bf26e7e8 Merge pull request #2036 from Giacom/fridayfriday
Added the friday the 13th event!
2013-12-17 16:58:37 -08:00
Razharas 358a85eb3d Completed the transition to a new proc
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
Aranclanos a5c4e99392 Fixed some runtimes and bugs regarding mob transformations and changelings. Now only monkeys and humans will have the changeling verbs when they change bodies. Brains, slimes and aliens won't. 2013-12-17 15:42:59 -03:00
Cheridan b68eadfb14 Nuke Op Tweaks
In response to feedback:
Dark Gygax no longer has the scattershot. Instead, it has a modestly powerful carbine loaded with incendiary rounds, solidifying its role as a hit-and-run and squad-support platform.
The Mauler now has the scattershot in addition to its existing arsenal, to give it that edge against crowds that you'll need at those higher populations.

Included with the new mecha weapon is a minor code refactoring of mech guns... There shouldn't be any noticable changes to the user. mech code is awful, guys
New sound effect for mecha launchers (Having the same sound effect for projectile launching and exploding drove me nuts.).

Nuke op flamethrowers now start with a full tank.
2013-12-16 23:56:49 -06:00
Aranclanos fd87128f57 Added some checks on the photocopier after the sleeps to avoid runtimes and made a new var "busy" to avoid exploits that ignored the wait times. 2013-12-16 22:08:10 -03:00
Aranclanos e136fd6cb5 If it's not human it doesn't mean that it's a silicon! Fixed a runtime regarding the ninja mask on scout mode. 2013-12-16 18:08:14 -03:00
Cheridan 0dde65750f Merge pull request #2038 from EuroNumbers/master
Pushing Turbine to be included in compile. Fixes interact() compile problem.
2013-12-16 12:30:45 -08:00
Cheridan 91354fd75f Merge pull request #2045 from Incoming5643/wands2
A change to how "continuous_round_wiz" works
2013-12-16 12:03:06 -08:00
Adrinus 1d173fe020 Adds a deck of cards. Works like real cards, without all the shuffling.
Fixed a few unforseen bugs and smoothed out a few odd quirks.
Fixed bugs, added flipping mechanics. Made the cards less cheater friendly by making certain actions visible.
Added the ability to choose between "Random Card" and "draw from Top" with a verb on the deck.
While held in hand the deck can now be shuffled.
Had to improve sprites, was really bugging me.
Now uses the shuffle() list helper.
Added cardshuffle.ogg to sound/items/
Cooldown applied to shuffling for "sanity" as the term seems to be.
Made a few changes to the way the cards prompt you for less clutter.
Merge pull request #1 from Zelacks/deckstuff
Replaces the global decks variable with a reference
Now card is taken from hand on topic choice.
Examine card has been scrapped, just attack_self() with the card to see what it is.
New Icons. Dig that NanoTrasen blue. Thanks Nienhaus!
Merge pull request #2 from Zelacks/deckstuff
Hopefully you will like these changes - Several deck changes
Fixed a few nits and picks.
Made Deck of Cards available as a prize from the arcade machines.
Merge pull request #3 from Zelacks/deckstuff
Card sprites! Thanks, was toying with doing that, saved me a bundle of work!
Fixed the adjacency issue.
Added more checks to the cards and object verb.
Adeed a series of fixes to the Mousedrop function. Made all notices uniform. Made changes to keep cards being flipped by the wrong sorts.
Added Razharas' "more readable" pixel art for the cards.
Made messages about the deck work while the deck is held. (I guess you might want to carry it)
Un-Needed cooldown removed from shuffling the deck.
Added blue contours to the cards to make them stand out against floor tiles.
Merge branch 'master' into 11-23-2013-Games
2013-12-15 23:43:08 -05:00
KazeEspada 7513625c48 fixes a rare runtime that occurs when the turbine couldn't find a compressor. Brings the code up to current standards. Removes the view function from the computer. Its rather obsolete in the days of telescreens. 2013-12-15 17:38:23 -07:00
Razharas b88af75828 And some more mistakes fixings
Yeah i suck at english sorry
2013-12-15 23:12:56 +04:00
EuroNumbers e9e9977249 Standarized the code further, added interact that doesn't shit the compiler 2013-12-15 19:23:54 +01:00
Razharas f2e0e5a193 Fixed minor typos and more use of new proc
Removed previously added ling logging proc, replaced with new one
Fixed some language
Fixed help and grab intent logging when you do it to yourself
2013-12-15 20:58:28 +04:00
Giacomand 1c5126fc98 Removed ONESIZEFITSALL.
Changed the THICKMATERIAL flag so it did not conflict with HEADCOVERSMOUTH.
2013-12-15 15:58:55 +00:00
Perakp 5d1f63f924 <span> and cable use()
- Added more span tags
- using cable now uses use()
- fixed use() to correctly return 1 when it succeeds
- checked that there were no checks that would’ve been previously
borked. For testing purposes I renamed use to use_cable (‘use’ is kinda
bad for a proc name, but use_cable is hardly better), but left that out
of the commit because it would’ve inflated the pr.
2013-12-15 12:07:55 +02:00
Incoming 1275e8bff8 A change to how "continuous_round_wiz" works
Currently, if the config option for continuous wizard rounds is off the round will end immediately following the death of the wizard.

With this change after the death of the wizard the game will additionally check to see if the wizard has made any antagonists that are still alive to do things after his death. The round won't end unless these antags don't exist or have all already died as well.

This allows for summon guns/magics survivors to not get blueballed out of antag round because the wizard died quickly. Additionally this allows wizards who made apprentices the chance for them to get the wizard alive again (the new healing apprentice has a staff that can raise the dead who is uniquely suited to this task.) Additionally additionally this allows for a mindswap wizard to not get instantly meta'd out when the round doesn't end when the wizard's head is caved it WITHOUT forcing extended on people.

This change was originally part of the Magic Mania pull, but was removed and placed in its own PR on request.
2013-12-15 02:07:28 -05:00