Commit Graph

408 Commits

Author SHA1 Message Date
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
Jordie 6008404738 Merge pull request #9185 from AnturK/aliens_stole_my_branch_name
Abduction Update 2.5
2015-05-02 23:59:48 +10:00
Jordie 3606662c88 Merge pull request #9106 from phil235/BundleFix5
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
AnturK 1f91bdbda1 Makes the alien floor randomized
Adds buying spare gear for experiment points
Makes kidnapping all mob/living stuff possible.
2015-05-02 12:54:53 +02:00
MrStonedOne eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
phil235 8f925be840 Merge branch 'master' of https://github.com/tgstation/-tg-station into GrassSpriteFix
Conflicts:
	code/game/turfs/unsimulated/floor.dm
	icons/turf/floors.dmi
2015-05-01 16:17:09 +02:00
MrStonedOne bd6d51a0b5 Massive MC and subsystem rewrite
MC:
	No longer tracks a subsystem's cpu usage. This was basically worthless and took up space on the stat panel
	Can calculate wait down to a tenth of a decisecond to make it fps/world.ticklag agnostic
	Now allows subsystems to have a dynamic wait, that is based on a ratio of how long that subsystem has been taking to process(cost). (This system allows for upper and lower bounds, and an changeable cost delta for each subsystem)
	MC can now be told to init a zlevel

All Subsystems:
	Stats panel now allows child subsystems to pass it a message to add to its stats entry. All subsystems have been moved over to this system - This should cut down on subsystems having to copy and paste the stats proc in order to add to it
	All subsystems now properlly handle being given a zlevel in their init proc

Subsystem changes:
	Air:
		Added air to the dynamic wait subsystem. upper bound: 50, lower bound: 5, cost delta: 3 times process cost
		Air now fires 4 times faster when it can do so without lagging things up
		Pipenet has been merged into air
		Atmos machinery now processes with process_atmos(), ticked by air, not machinery.
		Hotspots (the fire object) are now object pooled
	Pipenet:
		Deleted, added to air
	Machinery:
		Moved all atmos calcualtions in all objects's process() to process_atmos().
	Lighting:
		Added Lighting to the dynamic wait subsystem. upper bound: 20, lower bound: 5, cost delta: 3 times process cost
	Ticker:
		Fixed ticker not updating the lobby panel when game start delayed
		Fixed the game start timer updating rapidly from queued fires when game start delay is removed
	Garbage/qdel:
		qdel will now limit its process time to 2ds a fire.
		qdel can now be given hints as a return to Destroy() as to what should be done with the object.
		the options are:
			queue: (default) this is the normal behavior.
			letmelive: old default to non-null/zero. does nothing with the object
			iwillgc: functionally the same as above, mainly to let people working with objects know that the object will not be queued for GC checking
			harddel: this will queue the object to be deleted without storing a soft reference, mainly to save locate() processing time.
			harddel_now: this will del() the object. To allow for a clean removal of every del() not in qdel
		All objects have been updated to the new system, harddel and iwillgc was not added to any new objects.
		Fixed some objects not GCing because they didn't properlly clear references in Destory()
		Fixed some objects getting qdel'ed preventing other objects from getting GCed because they did not null their reference to that object.
2015-04-29 02:00:25 -07:00
Remie Richards 95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
phil235 6fb1b7ba8c Fixes broken grass sprite. Changes grass sprite to only use one sprite instead of four and makes it less flashy green.
Removes unused sidings sprites.
2015-04-26 15:56:47 +02:00
AnturK f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
phil235 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
phil235 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
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
phil235 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
Ikarrus 4ff044dc78 Gang v3 has been tested and is now good to go! 2015-04-19 22:26:15 -06:00
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00