Commit Graph

624 Commits

Author SHA1 Message Date
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
MrStonedOne 2f9b4cd3f2 Removes gas mixture graphic overlay code, Moves all of that to turfs.
(also fixes conflicts)

Conflicts:
	code/LINDA/LINDA_turf_tile.dm
2015-07-15 00:44:01 -07:00
xxalpha 15594439bc Fixed gases deleting all overlays of a turf when spreading.
Better code

SHIT
2015-07-11 00:18:33 +01:00
xxalpha 942b4fd790 Fixed false walls incorrect icon update.
Enabled mineral false walls.
2015-07-09 17:17:24 +01:00
xxalpha 18d8cedf9b Transformed the datum into isolated procs. 2015-07-09 02:38:30 +01:00
xxalpha 62ad116b73 Smoothed wizard den walls. 2015-07-08 07:29:00 +01:00
xxalpha 38195d5a0d Updated metastation, fixed wall smoothing updating.
Fixed metastation and ministation.

I think I got it this time.
2015-07-08 06:44:05 +01:00
xxalpha e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
xxalpha 5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
xxalpha b74a65ff8a Working rwall decon icons, map editor iconstates, all smooth. 2015-07-07 22:17:25 +01:00
xxalpha 0b906c6916 All walls, fakewalls, windows, carpet. 2015-07-07 19:50:31 +01:00
xxalpha 8d96d87337 smoothed balls 2015-07-06 18:16:18 +01:00
Aranclanos 04348c0197 Merge pull request #10301 from Cheridan/bacon_flavor_shuttles
Shuttle Burning No Ugly
2015-07-02 23:59:54 -03:00
Cheridan f39af4ee1a Shuttle Burning No Ugly 2015-06-30 14:15:23 -05:00
Ikarrus 8c1fde7947 Squashed Commits 2015-06-28 22:38:55 -06:00
Ikarrus 454348759d Workplace "Accidents"
- Slipping while carrying items in your hand may cause ~accidents~
  - 30% chance to attack yourself
  - 30% chance to attack the floor
  - 30% chance to throw the item towards the direction you're facing
- Throwing reagent containers such as drinks or beakers may spill their contents onto whatever they hit
2015-06-28 18:19:11 -06:00
Iamgoofball a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Remie Richards f5f833ecbb Merge pull request #9971 from KorPhaeron/newfloors
New Bluespace/Sepia slime reactions, new var for turfs
2015-06-23 03:43:28 +01:00
Remie Richards ee1e30717a Merge pull request #9980 from LaharlMontogmmery/ContentTransfer
Container Content Transfer - Good for Review (Again...Again.)
2015-06-21 00:09:19 +01:00
Cheridan a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05:00
LaharlMontogmmery 86d0a50776 Revert dump_act and dump_from_storage 2015-06-18 21:21:41 +02:00
LaharlMontogmmery 38ab424b8b More OOP! Also preparing the bases for another future PR. 2015-06-18 18:59:04 +02:00
LaharlMontogmmery 373c918a4a Going through some hOOPs - bit of a overhaul. 2015-06-18 17:40:35 +02:00
KorPhaeron 99735ea50d New floors from xenobio/new var for turfs
Turfs now have a slowdown var that will determine how fast mobs move on
it.

Bluespace slimes can now create bluespace floor tiles which give -1
slowdown using blood

Sepia slimes can now create sepia floor tiles which give 2 slowdown
using blood

Camera and film reactions merged into a single water reaction

Bluespace crystal reaction moved to plasma
2015-06-15 01:33:00 -05:00
xxalpha b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Jordie0608 a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
Iamgoofball 4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
Iamgoofball c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Remie Richards d72cb4bdf1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
Conflicts:
	code/game/machinery/doors/poddoor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/unsimulated/walls.dm
	code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +01:00
Carl Ivanov fdc4e7231e Update turf.dm 2015-06-04 14:03:14 +09:00
Carl Ivanov f7b84a0aea DENSITY = 1!
Make centcom walls dense.
2015-06-04 02:02:55 +09: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 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
Aranclanos dea72572c1 Created a new path of turfs, /turf/indestructible, they are only walls, turfs that are non interactive and static, like the splash screen or the borders of the different spawn spots of centcomm Z level (like wizard or nuke ops)
Fixes a few dirs of turfs in centcomm
2015-06-02 14:38:55 -03:00
Jordie bd0f38f1bc Merge pull request #9535 from RemieRichards/IBetYouDontEvenUnderstandSmoothwalls
Ports /vg/s Smoothwall code
2015-06-02 16:31:42 +10: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
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02: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
Cheridan a7a5a9acda Merge pull request #9543 from Aranclanos/astar
AStar fixes
2015-05-25 06:24:36 -05:00
phil235 802ff2dfa6 Merge pull request #9464 from Firecage/reinforcedfloorfix
Fixes infinite rods from reinforced floors
2015-05-21 16:01:20 +02:00
Aranclanos df02e068a0 Fixes diseases not infecting people behind tables or other objects with density that do not block air.
Fixes poly from smashing herself constantly against windows trying to reach unreacheable items.
Changed the way AStar selects the adjacent turfs from each turf, taking in count the capabilities of the object or mob who will move. For example, being able to pass over tables.
The new system will use the bitflag atmos_adjacent_turfs to reach for adjacent turfs and CanPass().
Fixes #436
2015-05-17 08:49:47 -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
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
Firecage e84ee8dd96 Fixes infinite rods from reinforced floors 2015-05-12 23:10:25 +02:00
xxalpha e5dfaaf007 Fixed cyborg floor tiles being infinite. 2015-05-11 22:08:16 +01:00
Jordie0608 7357a10f68 more fixes 2015-05-11 20:27:16 +10:00
Remie Richards 3b98e4448d Ports /vg/ DeityLink's new explosion effect, Blast doors are more resistant to explosions, Explosions can now take walls and doors into account (Cheaper than recursive explosions), Engine floors are more resistant to explosions. 2015-05-09 01:02:06 +01: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