Commit Graph

198 Commits

Author SHA1 Message Date
TheDZD 13f01232c9 Merge pull request #1480 from Fox-McCloud/qdel-the-dels
The Great Del() Cull of 2015
2015-07-09 22:37:43 -04:00
Fox-McCloud db17187584 Merge pull request #1474 from FalseIncarnate/cold_reagents
Cold Reactions and Applejack
2015-07-09 05:56:42 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
FalseIncarnate fa4fa1237e Cold Reactions and Applejack
Adds the ability to make a chemical reaction only occur when at or below
a specified temperature.

Adds new reaction for freezing water into ice
- Must be at or below 270K to turn water to ice

Adds two new reagents/drinks: Applejack and Jack Rose cocktail
-Applejack is obtained by freezing cider at or below 270K
- Applejack is slightly more potent than cider, due to it's alcohol
concentration being higher
- Jack Rose is a new mixed drink that is 4 parts Applejack, 1 part Lemon
Juice

Only Ice and Applejack utilize the cold reactions at this time, but the
functionality is in place for future reactions.
- This should allow coders more flexibility with defining new reactions
that may realistically occur at low temperatures.

Renamed the existing "required_temp" variable for reactions to
"min_temp" to better communicate it's purpose and differentiate it from
the new "max_temp" variable for cold reactions.
2015-07-08 04:34:25 -04:00
ZomgPonies 8d5d97bd45 Merge pull request #1468 from SamCroswell/computerupdate
Computer Lighting Update
2015-07-08 02:23:58 -04:00
SamCroswell 1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -04:00
Fox-McCloud 62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Tigercat2000 d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud 8e450f99c8 tweaks and optimization 2015-06-21 02:16:18 -04:00
Fox-McCloud 7b455d8b89 Re-Works Maintenance Loot 2015-06-04 18:53:13 -04:00
Fox-McCloud 5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies 1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
Krausus 8acfc2dc93 Fixes teleport artifacts inserting you into atoms 2015-05-22 09:13:38 -04:00
Krausus 42f0938bd8 Fixes Alden-Saraspova counter's scan timing 2015-05-18 03:13:02 -04:00
Krausus 7b34faae40 Fixes artifact analyzer anchoring wrong artifacts 2015-05-04 04:14:44 -04:00
Tigercat2000 4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud af925be951 TG spider port 2015-04-18 10:41:04 -04:00
Tigercat2000 29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
ZomgPonies 91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud 796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
Fox-McCloud a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Iamgoofball e5264815ee GOONCHEM 2015-03-24 02:04:47 -07:00
Fox-McCloud a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -05:00
SamCroswell b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
FalseIncarnate 85366b8307 Xenoarchaeology Find icon fix
Fixes the icons for the energy guns found through Xenoarchaeology to
actually use icons that exist.
2015-03-01 01:30:21 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Fox-McCloud 2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
DZD 4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
Fox-McCloud a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
DZD b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
Markolie 2a1e9931a6 Add shuttle stranding 2015-02-01 16:05:43 +01:00
Fox-McCloud eaa54e35a7 Vox Hardsuits and Spacesuits 2015-01-26 18:04:22 -05:00
Fox-McCloud 43af351d27 Odds and Ends 2015-01-01 21:05:50 -05:00
Markolie 17ae62bc99 Karma refund option, IPC radiation checks 2014-12-20 20:45:31 +01:00
Markolie c55c74207d Telescience port from /tg/ 2014-12-11 17:10:40 +01:00
Markolie 86f80d5a69 IPC fixes galore 2014-12-06 08:28:02 +01:00
SamCroswell 8b16d394ed Projectile Laser Update
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00
Zuhayr ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Zuhayr 13797e99ed New machines, adjusted Cael's seeds, rewrote space vines.
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/hydroponics.dm
	code/modules/hydroponics/grown_inedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
2014-07-25 10:06:19 -04:00
ZomgPonies 64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
Walter0o dbc621e7ab another missing battery check 2014-07-18 06:53:11 -04:00
Walter0o 8e9b1b1b95 missing power check
people could still use this without any charge
2014-07-18 06:52:55 -04:00
Chinsky ab8b3d25c4 Possible fix for #5645
I think issue is that harvester won't forget what artifact it is using until harvesting process is started.
2014-07-18 06:52:40 -04:00
Chinsky dbeb254062 Fixes #5650
Fixes #5649
Removed that mundane objects check as I couldn't think of why would that even be a thing.
2014-07-18 06:52:28 -04:00
Chinsky 5b1257ddb9 Fixes #5648
Now scanner will just give warning if clicked too fast, instead of giving obsolete data.
Also moved code from New() to initalize(), since it depends on all things already being there and a master controller existing.

Conflicts:
	code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
2014-07-18 06:51:59 -04:00