Commit Graph
4369 Commits
Author SHA1 Message Date
Markolie dd067f582a Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +02:00
DZD ed24ac47de Up to date with -tg-
- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.
2015-07-31 18:15:45 -04:00
Markolie 51035f931e Powernet rework 2015-07-31 23:59:41 +02:00
Fox-McCloud 0e6a3c36cf Lowers Cost of Clown Grenades 2015-07-30 16:39:43 -04: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
Fox-McCloud 1ee7853d65 Merge pull request #1476 from TheDZD/mining2
Mining Overhaul [Soon™]
2015-07-29 20:51:24 -04:00
Markolie c67bb095fb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-07-28 18:40:44 +02:00
Markolie 706d19c24f Reference/typo fixes 2015-07-28 17:28:56 +02:00
Markolie b6e446c446 NanoUI traitor uplink 2015-07-28 06:28:01 +02:00
Fox-McCloud 3ecaadde48 Merge pull request #1571 from Markolie/master
Fixes
2015-07-27 11:46:35 -04:00
Markolie 7dbd45857a Fix cult sacrifice objective 2015-07-26 06:06:04 +02:00
Fox-McCloud eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
DZD 66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
Fox-McCloud 0945859066 Merge pull request #1554 from Markolie/master
Fix OneHuman law
2015-07-22 16:57:23 -04:00
Markolie 4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
Fox-McCloud fde654557c Minor Uplink Cost Adjustments 2015-07-18 21:54:32 -04:00
Fox-McCloud 728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
TheDZD fbbceac377 Merge pull request #1499 from Fox-McCloud/blob-update
[Ready To Merge!]Blob Mode Major Overhaul
2015-07-16 20:34:08 -04:00
DZD 29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud 6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Fox-McCloud 04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
Fox-McCloud 898bcea1e8 Merge pull request #1489 from FalseIncarnate/master
Kitchen Machine Refactor and Max Item fix
2015-07-11 22:19:07 -04:00
Fox-McCloud f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
DZD 412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
FalseIncarnate 8a8011acbf Kitchen Machine Refactor and Max Item fix
Refactors the code for Microwaves, Ovens, Grills, and Candy Makers to
utilize a shared parent which holds the common procs.
- This means any new additions or fixes will only need to be implemented
in one place, rather than 4, to affect them all.
- Also reduces file sizes on the individual machines' files by removing
a lot of the duplicate code

Updated the code for the kitchen machines to be more modular and fixed
some issues.
- Replaced color macros with span classes
- Replaced hardcoded names with src references
- Each machine has a cook_verbs list which is used to create the in use
message (Microwaving in progress)
- Each machine has variables to define the icon states for the different
states of the machine (on, off, broken, dirty, open).
- Changed a few formerly global variables to not be global, as this
would cause issues with the shared code (microwave with candy maker
recipes for example)

Fixed a bug where the microwave would be considered "full" before having
all of the ingredients for a recipe
- Created a new proc to count the number of items and fruits in a recipe
to determine the max_n_items value

Map Edits to Cyberiad and associated Z-levels for pathing changes
(map-merged)
- MetaStation will need to be updated as well, I'll do this in another
PR unless someone else beats me to it.
2015-07-10 09:46:30 -04:00
Fox-McCloud 54f59b9899 Pass II 2015-07-09 19:51:40 -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 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud 9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
Tigercat2000 3a45d52fe0 Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
TheDZD 893e5a91c9 Merge pull request #1449 from Fox-McCloud/side-effects
Removes Unused/Non-functional Medical Side-Effects
2015-07-05 17:51:09 -04:00
Fox-McCloud 650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
Fox-McCloud c5c66a0f06 Merge pull request #1439 from SamCroswell/martialarts
Swaps Weaken Values, Fixes Span Bug
2015-07-04 01:46:48 -04:00
SamCroswell 45b89de37e Swaps Weaken Values, Fixes Span Bug 2015-07-03 01:03:59 -04:00
Fox-McCloud a569c898e9 tweak 2015-06-30 21:24:26 -04:00
Fox-McCloud 62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud c2567b92a8 Merge pull request #1414 from SamCroswell/martialarts
Thunderdome and Admin Room Changes
2015-06-30 16:55:10 -04:00
SamCroswell 4301223201 Fixes Icon Override 2015-06-29 17:50:01 -04:00
SamCroswell 47c633a547 Adds the bo staff and a new martial art 2015-06-29 15:57:13 -04:00
Fox-McCloud af2410c3f8 Fixes Pizza Bomb Pathing 2015-06-28 18:56:02 -04:00
TheDZD 7ed0902b4f Merge pull request #1374 from Robertha89/patch-1
Supply crates medical
2015-06-24 21:26:57 -04:00
Fox-McCloud 02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04:00
Robertha89 9573213bab revert viro access 2015-06-24 01:27:28 +02:00
Robertha89 733368a101 Supply crates medical
Adds brute trauma treatment kits to cargo.
Changes access on Virus crate from CMO to Virologist, as the reason it was there in the first place was due to the previous system having virus bottle for direct use, and without being able to feed this virus it can't infect people, maybe.
2015-06-24 00:48:37 +02:00
ZomgPonies 4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -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 a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04:00
Fox-McCloud 93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00
Fox-McCloud ada66fabd4 Update II 2015-06-18 17:47:52 -04:00