Commit Graph

1325 Commits

Author SHA1 Message Date
Cheridan f81da3f13d Merge pull request #9818 from phil235/TypoJanicartFix
Fixes typo in janitorial cart message.
2015-06-07 16:50:56 -05:00
Razharas 0e28326097 Merge pull request #9779 from Cheridan/touching_linda
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
phil235 24463314f9 Fixes typo in janitorial cart message. 2015-06-06 13:30:20 +02:00
phil235 ccd4137a9d Merge pull request #8974 from kingofkosmos/mopbucket
Mopping with just a bucket
2015-06-06 13:18:07 +02:00
Cheridan 6c12887367 Pressure_resistance Tweaks
-Adjusts pressure resistance, which determines how easily things can get pushed around by atmos.
-Most items (handheld stuff) are less resistant, while most larger items (mobs, structures, machinery) are more resistant.
-Removes the cooldown on air pushing stuff, which should make it feel more 'responsive', as opposed to the current push->pause->push->pause effect it does now.
-MAGBOOTS/NOSLIPS NOW PREVENT SPACEWIND PUSHING! !!!
-Adds a little wooshy breeze sound to when you would get pushed
2015-06-03 23:22:25 -05:00
Cheridan 2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Jordie bd0f38f1bc Merge pull request #9535 from RemieRichards/IBetYouDontEvenUnderstandSmoothwalls
Ports /vg/s Smoothwall code
2015-06-02 16:31:42 +10:00
Cheridan 5cfb18a18d Merge pull request #9558 from Firecage/spacewind_immune_vaccine
Makes the Janicart, Roller bed, and office Chair not 'immune' to spacewind.
2015-05-31 15:19:45 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Firecage bba300933a Moves the 5 pressure resistance to the base type. 2015-05-30 23:33:44 +02:00
Jordie0608 6b524f09a9 eol fixes (probably) and examine fix in closets 2015-05-28 20:48:47 +10:00
Jordie0608 b310811fdd reverts removing protectstation and clearing zeroth law 2015-05-28 19:13:30 +10:00
Jordie0608 e82c02744e paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon 2015-05-27 16:54:13 +10:00
Cheridan 053e26c221 Merge pull request #9454 from spasticVerbalizer/heatproofAirlocks
Un-snowflakes heat-proofing glass airlocks, fixes #9437
2015-05-24 21:22:50 -05:00
Incoming fd17e5fd57 Fixes a critical bug where clicking on a closed closet that can't be opened (welded most likely) would lead to an infinite loop of attacking attackby and attack_hand until the mob pulled away from the closet. Eating too many of these errors causes the server to cry for mercy and shut down. Meaning of course that EVERY PLAYER IN THE GAME WHO READS THIS PULL CAN NOW CRASH THE GAME AT THIER LEISURE.
So yeah merge quick please.
2015-05-20 23:00:28 -04:00
Firecage 3cd212502f Makes the Janicart, Roller bed, and office Chair not 'immune' to spacewind. 2015-05-18 23:35:19 +02:00
kingofkosmos 494403969e Alt-click-toggles now do proper checks
Such as if you're near the thing, conscious, alive etc.

Fixes #9238
2015-05-18 20:22:04 +03:00
Remie Richards cf536a9c16 Ports /vg/s Smoothwall code, Angry all caps comments from N3X15 included. 2015-05-16 21:05:18 +01:00
Aranclanos 965ebdaed8 Fixes range targets changing icons
Fixes issue #129
Removed the unused /datum/bullethole
Removed some copypaste code inbetween the targets and the target stakes
Made these objects not search for eachother in the nearby turfs, they both link to eachother now
Added removeOverlays() and nullPinnedLoc() procs for /obj/item/target
Added removeTarget() and nullPinnedTarget() procs for /obj/structure/target_stake
Added a huge list of additions to the commit log that nobody will read
Cleaned up the code for both objects (target and target stakes)
2015-05-14 03:30:32 -03:00
Cheridan ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
Resolves #1358, /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
Jordie0608 ec9382c43b Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
2015-05-13 20:01:27 +10:00
spasticVerbalizer 1468ad5b6f Heat-proofness now determined by the type of glass in the airlock 2015-05-12 11:33:21 +02:00
Cheridan f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
spasticVerbalizer 1cc928fac3 Makes the plasteel sheet drop when the assembly is disassembled without removing the sheet, grammars a comment 2015-05-11 21:12:18 +02:00
spasticVerbalizer bccb7cb14f Standardized heat-proofing airlocks 2015-05-11 20:52:31 +02:00
Jordie 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
spasticVerbalizer 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
Jordie0608 f36d6bec08 fixes false rwalls not smooting, actually fixes barnyard improving 2015-05-10 21:17:46 +10:00
Jordie0608 502d21a4da Merge branch 'master' of https://github.com/tgstation/-tg-station into redefiningwhatitmeanstobeadefine
Conflicts:
	tgstation.dme
2015-05-10 14:48:35 +10:00
spasticVerbalizer 087365e763 src.contents to src.loc.contents 2015-05-09 20:49:44 +02:00
spasticVerbalizer faf6bff92c Typecheck for turf being a wall, look in contents rather than loc. 2015-05-09 18:58:30 +02:00
GunHog 7c9667db38 Merge remote-tracking branch 'remotes/upstream/master' into The_Machine_Spirit_Sings_To_Me 2015-05-09 11:40:44 -05:00
Jordie0608 7369992d3d further reorganization, elimination of old defines folder 2015-05-09 23:16:57 +10:00
Jordie 4e82cd9689 Merge pull request #9355 from Firecage/OverlaycleanBGone
Removes the ability to clean Overlays
2015-05-09 21:30:21 +10:00
Jordie 279a2653c6 Merge pull request #9347 from SamuelRowe/master
Spelling and grammar fixes *FIXED*
2015-05-09 20:31:54 +10:00
GunHog 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
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
spasticVerbalizer 22fd9cc430 Added check to prevent false wall stacking 2015-05-06 15:35:17 +02:00
Samuel Rowe b8ce5bc7cf E 2015-05-06 15:31:09 +12: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
Firecage c0c2c8b097 cleanable #define 2015-05-05 18:51:44 +02:00
Firecage 522e77752f Removes the ability to clean Overlays 2015-05-05 17:36:51 +02:00
Jordie0608 e810855367 reorganizing stray objs in /defines 2015-05-05 21:18:21 +10: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