Commit Graph

7166 Commits

Author SHA1 Message Date
Cheridan 1da595b535 Merge pull request #8737 from RemieRichards/NinjaCleanup2
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
CosmicScientist 13060bb6f4 Adds space carp traitor item and fun for carp plushie. 2015-04-06 02:04:16 +01:00
MrPerson 94c0c1598d Fixes cleaner grenades
Fixes #8757
Default for locate is "in world"!
2015-04-05 16:55:17 -07:00
Xhuis 27625530e3 Kenny Loggins 2015-04-05 19:13:23 -04:00
kingofkosmos 68e0f06278 "var oldloc"s -> "var/oldloc"
Fixed the unsecured girder sliding below vents and scrubbers by placing it on layer 2.45.
2015-04-05 17:56:41 +03:00
phil235 cbbd5897ee Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated. 2015-04-05 16:48:50 +02:00
kingofkosmos 540e525e25 MADE FALSE WALL CONSTRUCTION TAKE SOME TIME (but only half the time of normal construction steps since it's not airtight and such).
Replaced numbered states with the GIRDER_stuff.

Fixed some grammar stuff.

Made reinforced girder deconstruction give the plasteel back when deconstructed.
2015-04-05 14:00:02 +03:00
Orange Borg a5306ba1e0 Fix can_speak check in megaphone
The original check actually made no sense, but worked because it returned false every time as there was never a message passed through
2015-04-05 20:29:07 +12:00
kingofkosmos 47fb65ca1f Removed the extra 4. Plasma cutting now produces 2 metals per girder. 2015-04-04 22:10:25 +03:00
kingofkosmos 052635da72 Changed to only user's fingerprints get to the new metal after disassembly. 2015-04-04 21:42:40 +03:00
phil235 6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes
Recieve --> Receive
2015-04-04 20:00:21 +02:00
phil235 f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Remie Richards 5e93f57873 Fixes energy katana emag spam. Fixes energy nets not anchoring their target. Fixes runtime from upgrading suit cell. Ninja stars ability changed to summon one obj/item/weapon/throwing_star/ninja with throw mode auto toggle on for instant throwing. Added ninja sword recall, Allowing the ninja to recall their sword back to themselves, if they can see the sword the ability is free, and the sword throws itself towards the ninja, hitting people as it does so. 2015-04-04 18:17:37 +01:00
Jordie 6d4f3b60f8 Merge pull request #8663 from dannno/sadclown
sad trombone for clown pda
2015-04-04 20:58:21 +11:00
Jordie 6d34032385 Merge pull request #8628 from Fayrik/AllTheSmallThings
Someone called for pest control?
2015-04-04 20:58:07 +11:00
Jordie 8d2f92cdd3 Merge pull request #8683 from AnturK/pickets
Adds Picket Signs
2015-04-04 20:57:56 +11:00
Jordie 3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus
Cyber Implants +
2015-04-04 20:57:48 +11:00
Jordie 20ed6aada5 Merge pull request #8668 from ACCount12/syndieboxes
Toolboxes & welders update
2015-04-04 20:57:15 +11:00
kingofkosmos e19ca2841d Girder disassembly changes
Current situation:
Wrench to girder (unsecured) -> secure girder
Wrench to girder (secured) -> disassemble girder
Crowbar to girder (secured) -> unsecure girder

This PR changes it to:
Wrench to girder (unsecured) -> secure girder (same as before)
Wrench to girder (secured) -> unsecure girder
Welder to girder (unsecured) -> disassemble girder

This is more consistent with nearly every other frame in the game, which have to be first unsecured with a wrench and then disassembled with a welder.
2015-04-04 12:03:26 +03:00
Orange Borg 09c102cf9a Update stunbaton.dm 2015-04-04 16:09:15 +13:00
Orange Borg de16628204 stun batons no longer lose charge over time 2015-04-04 16:06:59 +13:00
xxalpha 7ec043a542 Added medical hud implant to CMO locker. Added chest implant sprites. 2015-04-04 00:56:06 +01:00
phil235 493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
Remie Richards 862657bd7c Merge pull request #8421 from dannno/guncases
gun lockers
2015-04-03 18:40:40 +01:00
danno "big fucking moron" gonzales 1f94f2fe27 Update guncase.dm
change 4 to capacity
2015-04-03 13:19:45 -04:00
danno "big fucking moron" gonzales 8de848eccb Update guncase.dm 2015-04-03 13:16:25 -04:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
danno "big fucking moron" gonzales cd3f2516e0 Update PDA.dm
i fucked up
2015-04-02 16:42:14 -04:00
dannno fcd5938545 Merge branch 'master' of https://github.com/tgstation/-tg-station into sadclown 2015-04-02 16:30:08 -04:00
Xhuis 4377cd6536 Merge branch 'master' into stealthy_weapons 2015-04-02 16:10:37 -04:00
Artur 3ff5980e85 - Adds Picket Signs 2015-04-02 18:23:17 +02:00
dannno 6cba1d829c a buhhhhhh buhhhhhhhhhh 2015-04-02 10:21:06 -04:00
Jordie a8a2ffc123 Merge pull request #8662 from phil235/AddBloodFix
Fixes lack of dna in old blood.
2015-04-02 20:25:38 +11:00
Jordie 57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
ACCount12 cda61c1075 Welder&toolboxes update 2015-04-01 10:43:22 +12:00
dannno a2dfdc8f7b sad trombone for clown pda 2015-03-31 14:13:48 -04:00
phil235 0b403b3b03 Fixes lack of dna in old blood.
Fixes some comments about blood procs in atoms.dm
Small tweak in xeno blood blood_DNA.
2015-03-31 19:48:44 +02:00
Swag McYolosteinen d8c588867a Merge pull request #8634 from sawu-tg/master
See #7217
2015-03-31 19:40:33 +02:00
dannno 4051efc3a9 Proper UI for gun lockers 2015-03-31 12:54:24 -04:00
MrPerson d6be5a2e1b Move time for lighting changes from a scale to a fixed length
PDA's start off again, but the code is still there.
forceMove() now calls Moved() and has some other minor tidying up. This means teleporting will update the lights around you right away.
2015-03-31 05:09:46 -07:00
MrPerson e4a3abdd70 Object based lighting system
Uses actual objects on each non-space, dynamically lit turf. Light levels are switched back and forth via animate() and the object's alpha. Supporting colors shouldn't be too hard. Some hacky efficiency improvements means it isn't that much more expensive than current (I think, needs testing). Most of the lighting ss's cost is in checking all the lights and doing big loops, not anything actually in the loops themselves.

Start PDA flashlights on. This was to speed up testing but frankly I think it's a good change in general.

Added a Moved() proc. Called after a successful move.

In the future I hope to move off the luminosity var entirely but that was too slow in testing for me. That's what all that "for(area in sortedAreas) area.luminosity = 1" stuff in the lighting ss is, tests on removing luminosity outright.
2015-03-31 05:09:42 -07:00
Jordie 005c519b94 Merge pull request #8622 from phil235/TableclimbKnockFix
Fixes tableclimber knocking themself off the table when clicking it mid-climb
2015-03-31 22:06:51 +11:00
ACCount12 f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12 1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan 67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing
Fixes alien nest buckling
2015-03-31 00:06:14 -05:00
Cheridan 9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
phil235 12a729adcd Fixes many instances of lying mob getting shifted up (pixel_y reset to 0) by adding a lying_pixel_offset var to mob/living.
Removes the delay when toggling resting, sleeping and pouncing, the mob sprite will now update instantly.
2015-03-30 23:14:21 +02:00
phil235 0cef9e5539 Merge pull request #8198 from Xhuis/cigar_cases
Adds cigar cases
2015-03-30 18:47:46 +02:00
Sawu bfd0436324 See #7217
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)

(Old pictures, there is now only one can that changes color)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
2015-03-31 02:26:05 +11:00
Fayrik 9b834fca7a Look at all these bugs that no longer exist! 2015-03-30 03:36:24 +01:00