Commit Graph

1283 Commits

Author SHA1 Message Date
phil235 489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
Fixes #9035, atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
Jordie c9b804f6f6 Merge pull request #9256 from astralenigma/cradesbypaprka
Crates are mailed with manifests taped to the outside by paprka Merge Conflict resolution
2015-05-08 22:10:35 +10:00
Nienhaus 5812e63b4a Merge pull request #9313 from xxalpha/barsign
"The Net" barsign
2015-05-06 16:18:31 -05:00
Cheridan 95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
Cheridan f11122c255 Merge pull request #9338 from optimumtact/framingrage
Change machine frames and girders deconstruction step
2015-05-05 21:38:02 -05:00
oranges 4ac3497ebe Change machine frames and girders deconstruction step
They now use the screwdriver instead of the welding tool

On top of that I added a check to ensure you can't disassemble the same girder
more than once to farm materials
2015-05-05 10:32:57 +12:00
Cheridan 5bbf2be174 Merge pull request #9233 from Firecage/Operatingcuffing
Allows you to buckle people to an operating table.
2015-05-04 09:15:41 -05:00
Cheridan 191e011c14 Merge pull request #9272 from phil235/BundleFix7
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
xxalpha c0c4f8f4b6 Barsign 2015-05-03 15:01:16 +01:00
astralenigma 78fdf5e1f7 I think I'm done but I'm always wrong
Removed secure/new() due to it's current uselessness
Put all changes in the secure overlays inside the update icon
Found a bug where EMP act would only unlock the crate instead of
breaking it but would still apply the emag overlay I defaulted the fix
to breaking the crate.
Moved the variables from emag act and emp act upwards for compliance
with the update_icon() checks.
2015-05-02 21:37:33 +01:00
Jordie 3606662c88 Merge pull request #9106 from phil235/BundleFix5
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Ikarrus b331391aa5 Batons for Light ERT
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
astralenigma fe8e7f3f65 Moved the overlays.cut() per request. 2015-05-02 02:12:17 +01:00
phil235 be1708483e - Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02:00
astralenigma 8d72d9ef2b Second attempt at overlay
None of the crates appear with the manifesto outside, but he's there
waiting lurking in the shadows waiting to strike.
2015-05-01 08:01:54 +01:00
astralenigma 30b86c060f The manifest code is completed in the crate
just need to fix possible bugs that I find.
2015-05-01 02:57:39 +01:00
astralenigma d84bfc0f2b Putting all on github now.
Only crates is missing the overlay of the manifesto.
2015-05-01 00:33:21 +01:00
Incoming 7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
Firecage 03ca264eb1 Allows you to buckle people to an operating table. 2015-04-29 16:04:22 +02:00
Jordie 6bbc274789 Merge pull request #9073 from RemieRichards/DrawPixel
Adds DrawPixel() + Easels + Canvases!
2015-04-28 23:45:38 +10:00
Jordie0608 a6b3deda96 Merge branch 'master' of https://github.com/tgstation/-tg-station into doesrussellsteapotapplytorussellsteapot
Conflicts:
	icons/obj/closet.dmi
2015-04-28 22:31:11 +10:00
phil235 9132838420 Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
Conflicts:
	code/game/machinery/computer/ai_core.dm
	code/game/objects/items.dm
	code/game/objects/items/robot/robot_parts.dm
	code/modules/mob/living/carbon/brain/MMI.dm
2015-04-25 19:52:14 +02:00
phil235 35047e646e Readjusted rad effect from uranium walls.
mob/living/silicon/ai/ai.dm : one simplification plus "Normal" -> "Nominal".
2015-04-25 19:37:38 +02:00
kingofkosmos d9b8b146c8 Tried to fix merge conflicts, hopefully worked. 2015-04-24 21:52:36 +03:00
kingofkosmos de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos 72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Incoming f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
Jordie0608 15718c515d fixes opening lockers, atmos locker sprite and misc logging bug 2015-04-23 20:46:40 +10:00
phil235 6aadd8df8d Merge branch 'master' of https://github.com/tgstation/-tg-station into BundleFix5
Conflicts:
	code/modules/mob/living/carbon/life.dm
2015-04-23 01:32:20 +02:00
phil235 d6cc2c07c6 Fix mmi deafened indefinitely. 9078
Fix carp knocking borg. 7394
Replace carp knockdown by stamina dmg (for human only) (now 5 bites instead of 7 to go from 100% to crit w/o armor) 7905
Fix being stunned as a borg causing temporary blindness, deafness and muteness. 9061
Change robot out of power: now only stunned, can talk but not move or interact. Adding feedback in examine. 6170
Robots now take damage in the hottest of inferno (35,000+ K)  8840
Nerfs uranium wall radiation: 6 times less radiation (just double the effect of urafloor), chain reaction range down to 1. 6841
Fixes putting braindead/notincorpse/ghosted brains in mmi, and same for mmi in borgs, the action fails and sends a message to the ghost. 4841 7447
Fixes brains taking eye damage and becoming blind. 6039
2015-04-21 23:35:12 +02:00
Remie Richards 168979ef3a Removes a variable from an unused/unneeded fix to seeing paintings in hand. 2015-04-21 09:37:04 +01:00
kingofkosmos 2044f97400 Removed the if(state == 1) from girders. 2015-04-21 06:53:11 +03:00
Remie Richards a7c9976961 Adds Easels + Canvases, Sprites by Nienhaus 2015-04-20 19:06:24 +01:00
Swag McYolosteinen dc696c16cc Merge pull request #9028 from Fayrik/CentcomExpansion
Centcom change, Deathsquad buff and Abductors get the new advanced camera console.
2015-04-20 19:03:04 +02:00
phil235 b7db78cbaf Merge pull request #8741 from kingofkosmos/girderrakennus
Girder & machine frame disassembly changes
2015-04-18 13:06:04 +02:00
Fayrik 84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
Jordie0608 26ca19e07d Merge branch 'master' of https://github.com/tgstation/-tg-station into tfwyoubreakyourownfix
Conflicts:
	code/modules/mining/mine_items.dm
2015-04-17 18:02:45 +10:00
phil235 6807b1ae48 Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienNestPixelFix
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
2015-04-16 23:44:12 +02:00
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Cheridan 87edea4eab Merge pull request #8969 from phil235/BundleFix2
Another bundle of fixes
2015-04-15 21:08:13 -05:00
kingofkosmos d315681120 if(state == 1) added to few places. 2015-04-15 19:56:56 +03:00
phil235 d5318a033b Merge pull request #8933 from Cheridan/snackbar
New barsign!
2015-04-15 00:33:18 +02:00
kingofkosmos 6ba41ca7a7 Do_afters now use "target = src", removed oldloc-stuff.
False wall construction had a bug if you had exactly 2 sheets in your hand, it wouldn't work - fixed it.
2015-04-14 19:45:08 +03:00
phil235 2ed906b990 Fixes inhand sprites for eggs.
Fixes heart underwear sprite being too big.
Fixes being able to push a janicart through plastic flaps.
Fixes ERT medic closet starting with a combat defib with no cell. Empty combat defib can now get a cell inserted.
Fixes inconsistency in nukeop pinpointer upon activation, it now says standard pinpointer message plus the current mode (shuttle or disk).
2015-04-14 17:41:36 +02:00
phil235 0f6a60600d Fixes alien nest overlay appearing above standing mobs. Also fixes lying mobs appearing in front of standing mobs.
Fixes alien humanoid custom pixel shift being reset by life(). Refactors how pixel reinitialisation (when standing or lying or during animations) is done. Adding get_standard_pixel_y_offset() proc (and same for x), removing lying_pixel_y_offset var from all mobs, adding custom_pixel_x_offset (and y) so Wjohnston can play with his aliens.
2015-04-14 14:55:05 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Jordie 77cd7476a1 Merge pull request #8872 from optimumtact/patch-1
Fix electronics check in airlock code
2015-04-13 18:25:05 +10:00