Commit Graph
1569 Commits
Author SHA1 Message Date
Mark van Alphen f70f75704d Merge pull request #1796 from Fox-McCloud/detective-scanner
Detective Scanner Protolathe Production
2015-08-21 17:19:06 +02:00
DZD 5ce49bb3b3 Machine Upgrade Update
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
Markolie 87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Fox-McCloud d623c97741 Detective Scanner Protolathe Production 2015-08-19 18:16:52 -04:00
Markolie a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
TheDZD 625813286c Merge pull request #1699 from Markolie/rndserver
Fix RnD server deconstruction
2015-08-10 10:54:08 -04:00
Markolie 627c50c76b Fix RnD server deconstruction 2015-08-10 16:20:56 +02:00
TheDZD aadd7a4d9e Merge pull request #1675 from Fox-McCloud/welding-gas
Adds in Welding Gas Mask
2015-08-09 19:31:53 -04:00
Fox-McCloud 170ef64412 Adds in Welding Gas Mask 2015-08-08 16:17:11 -04:00
DZD 6e4cb0dc41 Catergory fix for protolathe
Fixes the category for the advanced plasma cutter and the sonic
jackhammer.
2015-08-08 16:14:10 -04:00
Fox-McCloud c3ad070066 Ports over Airhorns 2015-08-06 00:42:17 -04:00
Fox-McCloud 212a0ef643 Imprinter Runtime Fix 2015-08-04 21:13:20 -04:00
Fox-McCloud 82f62da60f Merge pull request #1604 from TheDZD/helper
Subtypesof Helper Proc
2015-08-03 17:44:01 -04:00
DZD d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Markolie aca3a2cecb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
	code/game/machinery/alarm.dm
	code/modules/power/smes.dm
2015-08-01 21:44:47 +02:00
Markolie 2c1d0ea7d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cloner
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:41:11 +02:00
DZD ba82f03d7c Drill and drone fixes
- Fixes mining drones having access to a plasma cutter energy weapon,
replaced with a diamond drill. Functionality is almost identical to what
it was with old plasma cutters.
- Pathing fixes for diamond drills.
2015-08-01 10:13:54 -04:00
Markolie 51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Markolie f939800c68 Update upgradable machinery New code 2015-07-30 22:19:32 +02:00
Markolie 660ffad9a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/power/port_gen.dm
2015-07-30 03:08:33 +02:00
DZD 51eca017ad Fixes based on feedback 2015-07-29 18:39:54 -04:00
DZD ab29813d4c Removes MRSPACMAN Generator
This used one of the Bay metals as a power source, I removed the actual
machine but forgot to remove the design and board. Whoops. Also, fuck
people setting object paths as strings instead of actual paths.
2015-07-29 17:32:06 -04:00
Markolie 69f7e04719 Prison break refactor, Requests Console refactor 2015-07-29 00:12:44 +02:00
DZD 3ed90434e0 Projectile, borg, and RnD fixes. 2015-07-10 21:36:23 -04:00
DZD 412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD d4cf433e7c Various fixes, changes, additions, and removal of old features.
More changes
2015-07-10 19:41:27 -04:00
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
DZD 1202538dc5 Actually compiles 2015-07-09 19:26:41 -04:00
DZD 916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -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
ZomgPonies 7df2c7e71d Merge pull request #1427 from Fox-McCloud/supermatter
TG Supermatter Port
2015-07-01 23:49:19 -04:00
FalseIncarnate 27f4ccda36 Grinder Fix, Botany qdel Refactor, Removes PanDEMIC2200
Fixes the reagent grinder machines not properly grinding tomato into
ketchup and rice into rice

Updates botany code to use qdel over del to help alleviate potential lag
from del calls

Removes the PanDEMIC 2200 board from Tech Storage and the Circuit
Imprinter, as the computer it builds has been commented out for a long
time. Also deletes the commented out code (over 250 lines of commented
out code deleted)
2015-07-01 22:09:37 -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 7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -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
Krausus ea34114321 Fixes protolathe stack-inserting runtime 2015-06-15 08:52:53 -04:00
Fox-McCloud 7b455d8b89 Re-Works Maintenance Loot 2015-06-04 18:53:13 -04:00
Tigercat2000 cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
Fox-McCloud 5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies d5f7f49c08 Merge pull request #1177 from Fox-McCloud/laserrrrzzzz
Researchable Surgical Tools Port
2015-05-26 22:21:10 -04:00
Fox-McCloud f6058e9c50 Researchable Surgical Tools Port 2015-05-26 18:52:09 -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
Tigercat2000 e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00