Commit Graph

410 Commits

Author SHA1 Message Date
Fox McCloud
bb4626e8ce Merge pull request #3782 from Spacemanspark/I-dont-think-Satoshi-Tajiri-intended-for-this
Adds Lazarus Injector emag_act()
2016-03-08 13:28:22 -05:00
Spacemanspark
c98cda3f55 Re-adds emp_act() to go alongside emag_act() 2016-03-07 19:54:39 -06:00
Spacemanspark
80f3b56318 Changes Lazarus Injector's emp_act() to an emag_act() 2016-03-07 11:18:02 -06:00
Fox-McCloud
488af2ac7a Gives Mining Drills and Edge 2016-03-06 04:33:21 -05:00
Tastyfish
d189d70f4a Adds tranquillite
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Crazylemon64
ba45bfff64 Ore satchels now work equipped in any "body" slot 2016-02-23 23:47:43 -08:00
Crazylemon64
343bbb28c1 Miners can now collect ore by walking on it while having an ore satchel on 2016-02-23 06:30:03 -08:00
Tastyfish
63048c7492 Fixes some spelling grammar errors 2016-02-22 04:11:04 -05:00
Crazylemon64
bc2e01349f Drilling the ground makes noise, and the fuel generators work off ore too now
You can also load your generators straight from the ore box, but this will be highly inefficient, as the ore reclaimer will be able to multiply the materials
present by a large factor
2016-02-19 17:51:15 -08:00
Crazylemon
7c3c27dde2 RIPLEY should now be able to actually drill for sand 2016-02-19 14:25:23 -08:00
Crazylemon64
93f5d97eed Mining drones will now collect sand 2016-02-19 10:57:57 -08:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Spacemanspark
5aa671b630 Fixes indents. 2016-02-09 01:41:22 -06:00
Spacemanspark
b6b3204bf7 Makes Mob Capsule code better. 2016-02-09 01:02:25 -06:00
Spacemanspark
24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Tastyfish
ec2e80ea65 Fixed airless floor being plasteel airless floor 2016-01-23 08:43:03 -05:00
Tigercat2000
66368a40e4 Fixes #3319
tgstation/-tg-station#12208
2016-01-21 20:23:46 -08:00
Aurorablade
1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Aurorablade
046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
Fox-McCloud
ea11eaa387 Ports Wormhole Projector 2015-12-19 00:57:40 -05:00
Tigercat2000
0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
Fox-McCloud
b7b9bdf66d drone cubes 2015-12-11 21:21:00 -05:00
Fox-McCloud
2c3bf2227e gar mesons 2015-12-10 23:34:17 -05:00
Fox-McCloud
068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
Tigercat2000
42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm
2015-12-09 10:08:28 -08:00
Certh
591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
Tigercat2000
79ce26684d Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-04 22:29:29 -08:00
Tigercat2000
356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT
Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm
2015-12-03 11:03:01 -08:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Crazylemon
b12ce7eb5a i r a gud pro gammer 2015-12-01 22:48:10 -08:00
Crazylemon
11562a8e03 Lets the ore reclaimer make plasma glass from plasma and glass 2015-12-01 22:19:54 -08:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
TheDZD
160cbf9e74 Merge pull request #2589 from Crazylemon64/miner_timestamps
Ore Reclaimer announcements are now timestamped
2015-11-19 14:29:17 -05:00
Crazylemon
646528790c Ore Reclaimer announcements are now timestamped
Did that uranium arrive just now, or with the last shipment? Now you
know!
2015-11-18 00:33:35 -08:00
Crazylemon
15f6da02c5 Uranium and plasma are now announced to the bartender
Enjoy your nuka colas, toxins specials, and 3 mile island iced teas, on
the house!
2015-11-16 01:16:55 -08:00
Crazylemon64
1b4a39eb24 MULEbots notify on relevant deliveries
Also:
	-Adds more request consoles throughout the map
		- Atmospherics, Brig Medbay, Warden, Security
2015-11-14 14:29:24 -08:00
Crazylemon
5636d721b0 Initial test of tg-esque mineral reclaimer announcements 2015-11-12 22:32:43 -08:00
Fox McCloud
cc6dcd72bb Merge pull request #2468 from tigercat2000/tg-life
-tg- Life() refactors
2015-11-07 23:08:01 -05:00
Fox-McCloud
16a208f545 Circuit Board Repathing and Swarmer Fixes 2015-11-06 21:21:36 -05:00
Tigercat2000
67e20ff5d5 -tg- Life() refactors
This commit does a *lot*
Main points of shit changed:
 - Breathing for carbons is now partially handled at a carbon/Life()
   level; Humans still use their species bullshit and all.
 - Most shit has been pushed up the chain to living/Life().
 - Simple_animals no longer use the fucking stupid Die() proc, they use
   death() like a consistant fucker.
 - Human vision is now handled via species.
 - Lots and lots of robot copypasta cleaned
  - AI is still a terrifying mess, not even -tg- touches it

I have tested this, and everything I thought to test worked:
 - Aliens breathing
 - Humans breathing
 - Human vision
 - Robot HUD
 - human HUD
 - Simple animals automatic systems
 - Simple animals dying properly
 - Robot goggles working
2015-11-04 16:32:57 -08:00
Tigercat2000
4bc8c737b1 Turf cleanup, Shoe unsnowflaking
This commit does the following:
 - Removes unused variables from turfs
 - Removes the mining/drilling folder following the removal of it's turf
   variables
 - All mobs now generate dirt on simulated turfs, not just humans.
 - Shoe sounds are now handled by a proc on shoes, step_action()
  - This is called by human/Move().
2015-10-10 10:00:51 -07:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Crazylemon
734e0842e2 Fixed a few more reversed add_logs
Did a search, and found 3 of these to patch up. Perhaps there's
something left, perhaps not.
2015-09-29 11:56:51 -07:00
Markolie
f69beaeb00 Drone fix, runtime fixes 2015-09-28 03:34:33 +02:00
TheDZD
7e9b2f99b1 Merge pull request #2091 from Fox-McCloud/destroy-them-all
Fixes up a few Destroys
2015-09-18 22:30:49 -04:00
Markolie
67e2f35f49 Ore redemption screwdriver fix 2015-09-18 18:29:05 +02:00