Cheridan
7dda365d92
Merge pull request #12316 from KorPhaeron/slip
...
Slipping tweaks
2015-10-19 14:44:28 -05:00
KorPhaeron
b3cc782b58
Lube only
2015-10-17 05:11:53 -05:00
Razharas
c44c6d90be
Merge pull request #12350 from AnturK/ironwall
...
Rough Metal Walls
2015-10-16 09:08:00 +03:00
Fox-McCloud
13f901f6ab
Makes Built-in Floor Tiles Pass through the GC
2015-10-14 17:13:05 -04:00
AnturK
c73526334c
Rough Metal Wall
2015-10-12 18:47:22 +02:00
KorPhaeron
2d1fc15fc0
Slipping
2015-10-11 08:17:35 -05:00
phil235
c4c447a8dc
Fixes hotspot having two New() procs.
...
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
duncathan
1278b3e8ef
fixes #11870 ; removes every last out of place del() call or definition
2015-10-04 08:03:04 -06:00
Xhuis
5f99b313cc
Radiation changes
2015-09-26 13:33:27 -04:00
xxalpha
22474094ae
Merge remote-tracking branch 'upstream/master' into hot_or_not
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha
655b1a77c7
Replaced refactored is_hot() to be an atom proc.
2015-09-24 01:12:38 +01:00
xxalpha
36ae116a48
Added another mode for smoothing (smooth with all subtypes).
2015-09-23 00:55:10 +01:00
xxalpha
fc073def62
Merge remote-tracking branch 'upstream/master' into smoothlattice
2015-09-22 19:40:01 +01:00
Cheridan
f5e8f921aa
Merge pull request #11900 from kingofkosmos/doafterdragemptycontainer
...
Pause before drag-drop-emptying container to the floor
2015-09-21 22:33:08 -05:00
kingofkosmos
6d46bba871
Changes do_after's target to src_object.
2015-09-21 19:34:39 +03:00
kingofkosmos
cd48a0cfed
Adds a do_after-pause for emptying a container.
2015-09-20 13:27:52 +03:00
phil235
bfa06222ea
Merge pull request #11830 from Aranclanos/updatetriggerthis
...
Removes update_triggers.dm
2015-09-19 16:47:19 +02:00
xxalpha
6bdd100eb6
Lattices and catwalks now use generic icon smoothing.
...
Put another check in smooth code to prevent runtimes
2015-09-19 14:55:09 +01:00
Aranclanos
2e33f9abb7
Fixes fingerprints not transfering to the cult wall girder
2015-09-16 23:49:44 -03:00
Aranclanos
caf4d7d5a5
Removes update_triggers.dm and moves the code inside of it to their respective procs. Most of the procs on this file were duplicated.
2015-09-16 21:52:25 -03:00
phil235
2333eb6b55
Merge pull request #11763 from RemieRichards/FootprintTweaks
...
Footprint Tweaks
2015-09-14 20:50:23 +02:00
Razharas
2f34e13177
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceTravel
2015-09-14 20:21:00 +03:00
Remie Richards
4bb97067b2
Tweaks amount of footprints, and fixes some bugs related to footprints, adds shoetype tracking to footprints
2015-09-13 15:36:56 +01:00
bear1ake
c52c4a5346
Merge remote-tracking branch 'tgstation/master' into point-zero
...
Conflicts:
code/modules/research/protolathe.dm
2015-09-12 21:07:40 +09:00
Razharas
17e5d0eea5
Merge pull request #11525 from xxalpha/dryshoes
...
Absorbent galoshes.
2015-09-10 22:01:03 +03:00
bear1ake
f697ae90f5
removes a bunch of .0
2015-09-10 20:57:30 +09:00
Razharas
161156cffc
Merge pull request #11585 from bgobandit/legitposters
...
Poster changes!
2015-09-09 02:38:56 +03:00
xxalpha
a62c09bbb7
Merge remote-tracking branch 'upstream/master' into dryshoes
...
Conflicts:
code/__DEFINES/misc.dm
2015-09-08 16:56:37 +01:00
Razharas
e28ecdfe45
Implements round-randomized space map
...
Implements round-randomized space map
Kills the cube
Adds config file for maps, so you can add more with just some non-code
edit
2015-09-07 21:33:11 +03:00
Razharas
9f0f1a9234
Merge pull request #11531 from RemieRichards/Bloody_footprints
...
Bloody footprints!
2015-09-07 16:07:03 +03:00
bgobandit
c5984f4359
Merge branch 'master' of https://github.com/tgstation/-tg-station into legitposters
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41G.dmm
2015-09-06 13:27:51 -04:00
bgobandit
261494e659
Made some changes and repathing for posters.
2015-09-04 18:30:58 -04:00
c0
df7386a4ec
Assemblies update
2015-09-04 11:22:37 +03:00
Remie Richards
ff07337841
Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too.
2015-09-02 01:32:02 +01:00
xxalpha
4ead972306
Drying agent. Recolor dry shoes
...
use define
2015-09-01 22:59:30 +01:00
xxalpha
7cc6070a13
Absorbent galoshes.
2015-09-01 17:08:59 +01:00
Aranclanos
7d96801475
Merge pull request #11480 from spasticVerbalizer/reinforceCheck
...
Adds check whether floor has been reinforced before using rods
2015-09-01 12:22:35 -03:00
xxalpha
94f045b73f
Merge remote-tracking branch 'upstream/master' into airlocking
...
Conflicts:
_maps/map_files/MetaStation/MetaStation.v41F.dmm
code/game/objects/structures/door_assembly.dm
2015-08-30 19:53:54 +01:00
Cheridan
32d74ad19c
Merge pull request #11433 from Core0verload/framed
...
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
Maarten van den Berg
3868bcdb23
Adds check whether floor has been reinforced before using rods
2015-08-30 14:59:13 +02:00
c0
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
Cheridan
eebbed3a6b
Merge pull request #11405 from Aranclanos/floortilesfirst
...
Floor re-organization step 1
2015-08-27 12:10:40 -05:00
xxalpha
47e68ee37c
Removed obsolete icon files.
...
Fixed
Fixed wizard doors
2015-08-27 16:52:15 +01:00
Aranclanos
3749dcacb3
Creates type paths for all types of floors in floor.dmi, first step for the floor organization.
2015-08-26 06:47:27 -03:00
c0
9cfb246e4f
Removes dirt from walking on tiles
2015-08-24 11:33:52 +03:00
Remie Richards
b70dfb8ece
Merge pull request #11189 from phil235/JanicartFixes
...
Slipping while buckled, some fixes
2015-08-18 20:26:36 +01:00
Remie Richards
1505dffec4
Merge pull request #11061 from phil235/ReacExplosionFix
...
Fixes reactionary explosion not acting correctly.
2015-08-18 20:16:23 +01:00
phil235
1cee0d3014
Fixes slipping on water while riding janicart.
...
The handle_slip() now also handles cases where the mob is buckled. If you are buckled and slip on lube (or something that ignores
galoshes) you get unbuckled and stunned and the buckle object moves one step (no slides unlike when unbuckled).
You can thus slip on lube while buckled to a chair or a roller bed.
Fixes getting hit by abstract held items when slipping.
Fixes janicart rider getting hit twice by bullets.
Removing the STEP constant var in slipping code, it's no more used.
Fixes carbon/slip() not returning the correct value.
Changed var/obj/structure/stool/bed/buckled to var/obj/buckled since buckled can now technically be any obj.
Removes hacky unbuckling/buckling in bed/Move()
2015-08-13 23:49:02 +02:00
Cheridan
63698004d6
Fixes Conflicts, Also Structural Code Stuff
2015-08-08 20:16:53 -05:00
phil235
278a3369c5
Fixes reactionary explosion not acting correctly.
...
Fixes indestructible turfs not blocking explosions.
Replacing cheap_pythag by cheap_hypothenuse
2015-08-06 16:53:11 +02:00