Commit Graph

1245 Commits

Author SHA1 Message Date
phil235
b7db78cbaf Merge pull request #8741 from kingofkosmos/girderrakennus
Girder & machine frame disassembly changes
2015-04-18 13:06:04 +02: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
Jordie0608
8610d24a75 merges secure closet code into normal closets, fixes overlay bugs 2015-04-13 17:38:57 +10:00
Cheridan
729be13486 New barsign!
In honor of https://www.reddit.com/r/SS13/comments/322cm1/ss13_confirmed_isis_recruitment_shill/

We need more subliminal messages to appease our ISIS overlords
2015-04-12 21:00:24 -05:00
phil235
6996897b65 Fixes fulltile windows not spawning the correct amounts of shards and rods.
Fixes broken grille not dropping a rod when shot with buckshots.
2015-04-11 17:41:09 +02:00
Orange Borg
0570ec92c7 Fix electronics check in airlock code
Because needhand defaults to 1 (on) it was always returning false as the item was dropped before the do_after check
2015-04-10 21:42:57 +12:00
phil235
4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
phil235
06f09fcd81 Merge pull request #8830 from Jordie0608/howdoyouknowyourbestfriendisntsecretlyawizard
Icon_door customability fix
2015-04-09 14:27:30 +02:00
Jordie0608
a405022ac9 State fixes 2015-04-09 16:27:39 +10:00
phil235
e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Jordie0608
24d047a116 icon_door customability fix 2015-04-09 00:05:16 +10:00
Cheridan
f537b43108 Merge pull request #8789 from phil235/BeartrapFix
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
Jordie0608
ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608
ffbef1f7d9 inversed check fix 2015-04-08 16:22:51 +10:00
Jordie0608
60cf76c881 fixes 2015-04-08 16:11:56 +10:00
Jordie0608
37277f66e7 pre-map compile 2015-04-08 15:40:41 +10:00
phil235
6b83575b28 Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
Conflicts:
	code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
phil235
1f6a6b0e8c Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
phil235
8499413649 Makes living/verb/resist more object oriented.
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02: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
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
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
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
Jordie
3bb6cc8af9 Merge pull request #8625 from xxalpha/cyberplus
Cyber Implants +
2015-04-04 20:57:48 +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
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
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
dannno
4051efc3a9 Proper UI for gun lockers 2015-03-31 12:54:24 -04: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
Cheridan
67d9f77ea9 Merge pull request #8600 from phil235/AlienNestFixing
Fixes alien nest buckling
2015-03-31 00:06:14 -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
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
phil235
0745219d06 Fixes tableclimber knocking themself off the table when clicking it mid-climb. 2015-03-29 23:57:47 +02:00
phil235
2ef01a61c5 Fixes alien nest not blocking the victim from instantly unbuckling. The victim now needs to click the nest or resist, then wait 2 minutes before being free.
Fixes alien nest buckling pixel offset.
Removes resist unbuckling 'success' message so there's not two unbuckling messages.
Fixes objects with buckling not unbuckling its buckled mob when the mob is gibbed (Fixes alien nest overlay not disappearing when larva burst and gib its host).
2015-03-28 23:02:44 +01:00