bd12598404
Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls
...
Adds check to prevent false wall stacking, fixes #6449
2015-05-11 00:07:11 +10:00
040fd7d8b7
Change uses of 'usr' to 'user', move checking of wall up so the message actually shows
2015-05-10 13:31:10 +02:00
087365e763
src.contents to src.loc.contents
2015-05-09 20:49:44 +02:00
faf6bff92c
Typecheck for turf being a wall, look in contents rather than loc.
2015-05-09 18:58:30 +02:00
7c9667db38
Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me
2015-05-09 11:40:44 -05:00
4e82cd9689
Merge pull request #9355 from Firecage/OverlaycleanBGone
...
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
279a2653c6
Merge pull request #9347 from SamuelRowe/master
...
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
26df5b6c8e
Removes mining drill power mechanic.
...
- Removes the power mechanic from mining drills and the sonic
jackhammer.
- Fixes broken borg diamond drill upgrade.
2015-05-08 10:12:22 -05:00
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
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
5812e63b4a
Merge pull request #9313 from xxalpha/barsign
...
"The Net" barsign
2015-05-06 16:18:31 -05:00
95d7af4e48
Merge pull request #9277 from Ikarrus/ertbaton
...
Batons for Light ERP
2015-05-06 09:03:55 -05:00
22fd9cc430
Added check to prevent false wall stacking
2015-05-06 15:35:17 +02:00
b8ce5bc7cf
E
2015-05-06 15:31:09 +12:00
f11122c255
Merge pull request #9338 from optimumtact/framingrage
...
Change machine frames and girders deconstruction step
2015-05-05 21:38:02 -05:00
c0c2c8b097
cleanable #define
2015-05-05 18:51:44 +02:00
522e77752f
Removes the ability to clean Overlays
2015-05-05 17:36:51 +02:00
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
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
191e011c14
Merge pull request #9272 from phil235/BundleFix7
...
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
c0c4f8f4b6
Barsign
2015-05-03 15:01:16 +01:00
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
3606662c88
Merge pull request #9106 from phil235/BundleFix5
...
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
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
fe8e7f3f65
Moved the overlays.cut() per request.
2015-05-02 02:12:17 +01:00
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
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
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
d84bfc0f2b
Putting all on github now.
...
Only crates is missing the overlay of the manifesto.
2015-05-01 00:33:21 +01:00
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
03ca264eb1
Allows you to buckle people to an operating table.
2015-04-29 16:04:22 +02:00
6bbc274789
Merge pull request #9073 from RemieRichards/DrawPixel
...
Adds DrawPixel() + Easels + Canvases!
2015-04-28 23:45:38 +10:00
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
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
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
d9b8b146c8
Tried to fix merge conflicts, hopefully worked.
2015-04-24 21:52:36 +03:00
de280c72b5
Removed some more spans from visible messages.
2015-04-24 21:06:59 +03:00
a7bd5f93e1
"You hear something" set to italics.
2015-04-24 21:06:16 +03:00
e371dd9f35
more spans
2015-04-24 20:52:00 +03:00
72749392d8
span classes removed from visible.messages
2015-04-24 20:50:51 +03:00
1d14471d00
Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark.
2015-04-24 20:50:50 +03:00
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
15718c515d
fixes opening lockers, atmos locker sprite and misc logging bug
2015-04-23 20:46:40 +10:00
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
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
168979ef3a
Removes a variable from an unused/unneeded fix to seeing paintings in hand.
2015-04-21 09:37:04 +01:00
2044f97400
Removed the if(state == 1) from girders.
2015-04-21 06:53:11 +03:00
a7c9976961
Adds Easels + Canvases, Sprites by Nienhaus
2015-04-20 19:06:24 +01:00
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
b7db78cbaf
Merge pull request #8741 from kingofkosmos/girderrakennus
...
Girder & machine frame disassembly changes
2015-04-18 13:06:04 +02:00
Jordie
spasticVerbalizer
GunHog
phil235
Nienhaus
Cheridan
Samuel Rowe
Firecage
oranges
xxalpha
astralenigma
Ikarrus
phil235
Incoming
kingofkosmos
Remie Richards
Swag McYolosteinen