cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,267 Commits 26 Branches 2 Tags
0d627d321393670d0406d49b4e3d66ce8c4bcadc
Commit Graph

393 Commits

Author SHA1 Message Date
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
Fox-McCloud
74565c101b Fixes up a few Destroys 2015-09-18 04:20:02 -04:00
Mark van Alphen
8625c7f8f0 Merge pull request #2060 from Fox-McCloud/ore-materials 
Adds Materials to Ore
 2015-09-16 20:22:54 +02:00
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine 
# Conflicts:
#	code/game/objects/structures/displaycase.dm
 2015-09-15 14:08:36 -07:00
Fox-McCloud
de98aa2b9d Adds Materials to Ore 2015-09-15 06:08:20 -04:00
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
 2015-09-15 04:18:27 +02:00
Fox-McCloud
47cab7ed38 Merge pull request #2053 from Markolie/lesser 
Fixes
 2015-09-14 18:03:49 -04:00
Markolie
7a0c1bae77 Fix ore redemption deconstruction 2015-09-14 22:26:09 +02:00
Tigercat2000
0603f73232 Bay12 examine overhaul. 
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
 2015-09-14 11:51:40 -07:00
Mark van Alphen
e00799790f Merge pull request #2020 from Fox-McCloud/rnd-materials 
Rnd materials
 2015-09-14 00:50:30 +02:00
Fox-McCloud
3ce1e989ce Materials Consistency Fix/Update 2015-09-13 17:49:36 -04:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Fox-McCloud
25c35343dc materials-consitency 2015-09-12 16:22:39 -04:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes 
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
 2015-09-07 11:51:00 -07:00
Fox-McCloud
e20fedaec1 Merge pull request #1957 from tigercat2000/tg_xeno_tweaks 
Misc. -tg- xeno tweaks
 2015-09-06 16:48:15 -04:00
Tigercat2000
54d2fa8c84 Misc. -tg- xeno tweaks 
This commit does the following:
 - Allows xenomorphs to mine through mineral turfs (the asteroid)
 - Changes weed spreading to use atmos procs; It will spread like gas, not
   just checking "oh, dense object, no pass for me!"
  - No, this doesn't mean it will spread infinitely or quicker, just
    changes where it can spread.
 2015-09-05 08:34:08 -07:00
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00