cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

1073 Commits

Author SHA1 Message Date
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Tastyfish
16c8e24f04 Tweaks/fixes some bot radio/language stuff, lazarus capsules 2016-04-04 02:02:19 -04:00
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
 2016-03-31 13:33:46 -04:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
Tigercat2000
25fa8ea2c9 viro consoles 2016-03-29 19:15:17 -07:00
Fox-McCloud
c2fe562ad2 Puke Fix 2016-03-28 22:39:53 -04:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
TheDZD
df8073f12e Merge pull request #3851 from Fox-McCloud/xeno-fixes 
Facehugger and Embryo Fixes
 2016-03-12 11:29:45 -05:00
Fox-McCloud
0dc0ada004 Facehugger and Embryo Fixes 2016-03-12 03:00:54 -05:00
monster860
f6ccfc9ae7 Merge branch 'master' into fuckyougit 2016-03-11 06:17:16 -05:00
monster860
f4191293eb Spesspod Mining Laser - Fuck You Git edition 2016-03-10 21:24:21 -05:00
TheDZD
4e47626af7 Merge pull request #3767 from Tastyfish/silence 
Tranquillité, Prospérité & Mimeré
 2016-03-08 19:32:29 -05:00
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