Commit Graph

5193 Commits

Author SHA1 Message Date
Cheridan
d7e3363129 Merge pull request #9817 from xxalpha/dropfixes
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
Cheridan
29c2bb474d Merge pull request #9804 from Firecage/Exwelder
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
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
xxalpha
9cb1061bfb Fixed hacking from inside machines and more. 2015-06-06 11:34:12 +01:00
Firecage
ab4725f709 Makes the experimental welder only regen fuel while off. 2015-06-06 11:37:59 +02:00
Cheridan
9e65cdeb6a Merge pull request #9391 from Ikarrus/gangmessaging
Gang-Wide Messages
2015-06-05 22:01:54 -05:00
Firecage
89e2fbf0bb Adds the experimental welder to R&D + adds some descriptions. 2015-06-05 20:43:21 +02:00
Cheridan
05072bcf31 Merge pull request #9771 from xxalpha/dropitlikeits
Fixed PDA accepting items when spessmen can't drop items.
2015-06-04 20:04:04 -05: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
xxalpha
ecb15b21c2 Fixed PDA accepting items when spessmen can't drop items. 2015-06-03 20:16:11 +01:00
Cheridan
e4999fd233 Merge pull request #9719 from CandyClownTG/patch-1
Ointments and bruise packs stacking
2015-06-03 00:51:02 -05:00
Cheridan
a19f1801ff Merge pull request #9699 from KorPhaeron/turf
Changes how destroying/building turfs works
2015-06-02 23:15:42 -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
Cheridan
d31f534446 Merge pull request #9745 from Incoming5643/super_bummer_man_64
Fixes overexcited TTV reporting
2015-06-02 22:04:20 -05:00
Cheridan
905f350597 Merge branch 'unsimulatedIsKill2' of git://github.com/Aranclanos/-tg-station into Aranclanos-unsimulatedIsKill2
Conflicts:
	code/game/smoothwall.dm
2015-06-02 13:45:56 -05:00
Jordie
bd0f38f1bc Merge pull request #9535 from RemieRichards/IBetYouDontEvenUnderstandSmoothwalls
Ports /vg/s Smoothwall code
2015-06-02 16:31:42 +10:00
Incoming
e608a16edf Tank Transfer Valves won't pester the admins if the volume of the two tanks are equivilent before they are mixed. 99999/100000 times this means that the tank was already opened once and fouled, and the remaining 1/100000 the toxins guy was AMAZINGLY crap at his job. 2015-06-01 23:11:42 -04:00
Aranclanos
e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Incoming
061478165a upgrades the HARDFEET species flag to PIERCEIMMUNE
In addition to keeping golem feet safe as always golems are now immune to object embeding. As a mitagating nerf and logical extension, golems can no longer be injected with chems either.
2015-05-31 18:54:30 -04: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
Cheridan
e3b92f0caf Merge pull request #9656 from bear1ake/pda-id-drop-fix-2
Fix for #4219. Variant 2
2015-05-31 14:35:00 -05:00
Cheridan
426fa3c18d Merge pull request #9680 from kingofkosmos/healthscannerchanges
Health analyzer output reordering
2015-05-31 14:12:09 -05:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
CandyClownTG
b158d35536 Update medical.dm
Ointments and bruise packs are now in stacks of 6 instead of 5.
2015-05-31 02:37:07 -04:00
Firecage
84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
Firecage
bba300933a Moves the 5 pressure resistance to the base type. 2015-05-30 23:33:44 +02:00
kingofkosmos
0588647ba4 Switched up the order of shown damages. 2015-05-30 11:37:22 +03:00
KorPhaeron
bfe5e4a855 Cleaning up turf code
Changes colons and spaces I forgot you could do this on github
2015-05-29 19:27:28 -05:00
KorPhaeron
97990c94cc Changes how destroying turfs works
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.

Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).

Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).

Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.

Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.

I should have done this years ago for away missions.

Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
Razharas
e13e6e8601 Merge pull request #9665 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
Bugfix the anti-ninth
2015-05-29 15:21:51 +03:00
Razharas
6f86281d0e Merge pull request #9660 from Cheridan/auth_button
fixes #9599 weapons auth button
2015-05-29 15:15:16 +03:00
Cheridan
10f2b7ae00 Merge pull request #9559 from xxalpha/cardtrick
Card deck fixes and storage fixes.
2015-05-28 21:41:00 -05:00
kingofkosmos
361693d7f8 Reordered stuff. 2015-05-28 20:48:23 +03: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
duncathan
f4f5ccae61 cleanup of various unused/useless things
removed unused pipe vars alert_pressure, fatique_pressure, maximum_pressure
moved pipe vars maximum_temperature_difference, thermal_conductivity to h/e pipes
removed insulated pipes, as they are identical to simple pipes in every way
removed insulated pipes from RPD.dm, pipe_dispenser.dm and construction.dm
removed red_pipe.dmi
changed instances of insulated pipes on box (whyyyy) to simple pipes
2015-05-27 18:12:12 -06:00
Jordie0608
e82c02744e paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon 2015-05-27 16:54:13 +10:00
Jordie0608
0cafaf9373 zeroth laws can be removed with core boards 2015-05-27 12:09:09 +10:00
Cheridan
5f22a3c025 fixes weapons auth button 2015-05-26 15:22:24 -05:00
kingofkosmos
a90fc31df1 Medical scanner output changes. Rounding, capitalization, grammar etc.
Minor changes to gas scanner output.
2015-05-26 21:44:32 +03:00
Cheridan
c4254a727d Merge pull request #9638 from CosmicScientist/EnglishFixes
Fixed some general spelling and grammar
2015-05-26 03:53:37 -05:00
Carl Ivanov
8122ddc94f Delete ID's when PDA destroys. 2015-05-26 17:01:00 +09:00
Remie Richards
373c72773f Merge pull request #9617 from Miauw62/maniasureamgoodatcomingupwithgooddescriptivebranchnamesdontyouthinksobecausethisbranchnameisverygoodanddescriptive
Makes all machines use the robot font.
2015-05-25 18:31:15 +01:00
Cheridan
fb2beca318 Merge pull request #9602 from Aranclanos/AItracking
Fixes all possible exploits with the AI tracking href link
2015-05-24 23:26:31 -05: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
Cheridan
f12f12ed60 Merge pull request #9562 from Aranclanos/newscaster
Newscaster code big cleanup.
2015-05-24 19:47:05 -05:00