Commit Graph

230 Commits

Author SHA1 Message Date
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
Cheridan
7a469e240a Merge pull request #11437 from bgobandit/dronepax
Refactors medical stacks used on simple animals.
2015-08-29 18:55:27 -05:00
Cheridan
87eae12f89 Merge pull request #11425 from bgobandit/golemsandglass
Golems no longer take damage from attacking with glass shards.
2015-08-29 11:17:34 -05:00
bgobandit
1e57cc6845 fixes ellipsis 2015-08-28 14:22:29 -04:00
bgobandit
607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
2015-08-28 02:54:43 -04:00
bgobandit
6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
bgobandit
326d849836 You can no longer use bruise packs, ointment or other medical stack items on drones. 2015-08-28 00:51:24 -04:00
c0
14bd455287 Button frame added to metal 2015-08-28 02:04:33 +03:00
c0
8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
bgobandit
1009c08ff4 Golems no longer take damage from attacking with glass shards. 2015-08-27 14:55:48 -04:00
Remie Richards
9622676d1e Merge pull request #11132 from Cheridan/too_much_fun
Astral Tiles 1.01 - Fun Removal
2015-08-12 06:20:54 +01:00
Cheridan
3a5cde5988 Merge pull request #10901 from CosmicScientist/mobcostumes
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
Cheridan
2df4cdb7cd Thank you Remie for catching this intentional error.
Removes amount = 30
2015-08-09 23:07:24 -05:00
Cheridan
e6fe8baa24 Astral Tiles 1.01 - Fun Removal 2015-08-09 23:02:32 -05:00
Cheridan
63698004d6 Fixes Conflicts, Also Structural Code Stuff 2015-08-08 20:16:53 -05:00
CosmicScientist
2844c80ed5 Fixing merge conflicts 2015-08-08 15:43:38 +01:00
Cheridan
eb210ab6e8 Adds Astral Carpet Tiles 2015-08-05 23:46:49 -05:00
MrPerson
b0d511eff2 Automatic stack merging
When a stock moves onto the same tile as another stack, they merge together. Unless it was being thrown, in which case no, they don't merge. Unless the stack was the original target to begin with, then yes, they do merge.

Just a convenience feature. The one downside is that crowbarring up a floor tile won't merge with other tiles on the floor, but if someone makes that event call Move() like it's supposed to, it should work fine. That would just be out of scope for this PR.
2015-08-01 10:34:50 -07:00
CosmicScientist
2d2e1acf6a Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder 2015-07-28 20:19:26 +01:00
Jordie
9b0b4e1aa4 Merge pull request #10710 from xxalpha/cablecoilbackpack
Fixed storage not updating when joining cable coils.
2015-07-25 19:12:26 +10:00
xxalpha
8e00cdfe9a Fixed storage not updating when joining cable coils.
Fixed stack objects not updating storage when deleted.

Added handle_atom_del proc to be called on destroy.

Label comment for handle_atom_del()
2015-07-22 17:58:05 +01:00
phil235
452313a5fa Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Xhuis
f40b4381d4 Separates construction into the door and a frame 2015-07-11 11:25:14 -04:00
Jordie
1714a8ee10 Merge pull request #10447 from xxalpha/plasmafix
Fixed plasma not stacking.
2015-07-09 20:45:21 +10: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
49cb301318 Fixed plasma not stacking. 2015-07-07 17:38:23 +01:00
Razharas
d03006d17b Merge pull request #10304 from TheVekter/dogbedwoofwoof2
Replaces the crate in HoP's office with a dog bed
2015-07-03 04:27:48 +03:00
xxalpha
4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
Ikarrus
6595a39147 Plasma sheets can burn now 2015-07-01 13:33:05 -06:00
TheVekter
27ed60102d They're craftable now! 2015-07-01 00:41:49 -05:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Cheridan
46acc2a55d REMOVES CABLE CUFF 2015-06-06 16:21:41 -05:00
Cheridan
e4999fd233 Merge pull request #9719 from CandyClownTG/patch-1
Ointments and bruise packs stacking
2015-06-03 00:51:02 -05: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
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
Jordie0608
2b9c8ac98c fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons 2015-05-17 01:58:46 +10:00
xxalpha
e5dfaaf007 Fixed cyborg floor tiles being infinite. 2015-05-11 22:08:16 +01:00
Firecage
1fb8dcecd1 Prevents golems and skeletons from dropping due to shards and mousetraps 2015-05-07 15:44:17 +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
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
phil235
752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +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