cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,253 Commits 26 Branches 2 Tags
ccbe2ca904ed239a01f753a9fda3bb4f3527d2ef
Commit Graph

836 Commits

Author SHA1 Message Date
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
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
Tigercat2000
519992b5a9 Merge branch 'byond510' 
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
 2016-04-01 14:15:44 -07:00
Tastyfish
1fc692ba94 Adds power-generating treadmills to brig cells. 2016-03-30 17:08:04 -04:00
Fox-McCloud
08c06782ee Can Make Cable Coils in Autolathes 2016-03-15 22:40:49 -04:00
Tastyfish
5e5083ba23 Fixes some things for away missions, and a few missions themselves 2016-03-11 00:42:22 -05:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Crazylemon
b6e737c151 Supermatter explosion now only affects mobs on the same z-level 2016-01-25 17:03:09 -08:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Fox-McCloud
3b16c556f4 Supermatter Fix 2016-01-09 21:46:02 -05:00
TheDZD
da141868a3 Merge pull request #3152 from Fox-McCloud/tesla-tweak 
Balances the Tesla
 2016-01-08 17:28:54 -05:00
Fox-McCloud
4ed2f89872 Balances the Tesla 2016-01-07 16:43:38 -05:00
Fox-McCloud
3b73425d31 Adds in Overloading of APCs 2016-01-07 03:59:05 -05:00
Fox McCloud
9c863e5259 Merge pull request #3092 from tigercat2000/tgsmooth 
-tg- Smoothing/Floor refactor
 2016-01-03 22:28:50 -05:00
Tigercat2000
31aab5452b -tg- smoothing/floor refactor 
Squashed:

Add plasteel goonplaque turf

Builtin_tile nulling

Levelupdate()

Fix falsewalls, update smoothing.dmm

fixes rwall decon
 2016-01-03 19:24:13 -08:00
Tigercat2000
b606a6d1fd Clean incorrect styling for the ++ operator 2016-01-02 10:46:01 -08:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Crazylemon
6a931ef868 Removes the apc from the area's APC list when destroyed 2015-12-31 22:34:03 -08:00
Tigercat2000
9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
Aurorablade
b58ed5a9d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-26 22:18:09 -05:00
Aurorablade
2146cc0d3d things 
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
 2015-12-26 17:34:38 -05:00
Fox-McCloud
bfb23936f9 Tesla Update and Orbit Update 2015-12-24 10:29:10 -05:00
Fox-McCloud
7677864951 derp 2015-12-24 02:31:53 -05:00
Fox-McCloud
a1e4446f9c better logging 2015-12-24 01:42:48 -05:00
Fox-McCloud
5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Aurorablade
1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Fox-McCloud
bbf3b528c4 Field Generator Refactor+Fixes 2015-12-22 13:40:53 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05: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
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Fox-McCloud
0834bfb865 more robust logging 2015-11-03 07:16:14 -05:00
Fox-McCloud
8774ec1f66 Lights and Static Power: Machine Processing Optimization 2015-10-18 21:06:25 -04:00
TheDZD
d681cefa03 Merge pull request #2362 from Fox-McCloud/gc-everything 
Garbage Collect Everything
 2015-10-18 16:44:35 -04:00
Crazylemon
3c3f51401b Cuts out all the old weapon/module code 
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
 2015-10-13 21:13:49 -07:00
Fox-McCloud
e60edf9345 Garbage Collect Everything 2015-10-13 20:23:26 -04:00
TheDZD
cbe21922ef Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing 
More Dereferencing
 2015-10-12 16:36:14 -04:00
Fox-McCloud
46f9f68f31 more de-referencing 2015-10-12 04:18:49 -04:00
Tigercat2000
ccdae149bb -tg- pull refactor 
This commit does the following:
 - Overhauls how pull works. It is now based on a mob verb,
   mob/verb/pulled()
 - Makes the pull icon much more responsive. It is now updated whenever a
   mob starts or stops pulling an object, and instantly updates.
   - This required HUD changes. God help me.
 2015-10-10 11:15:52 -07:00
TheDZD
07770fdda7 Merge pull request #2321 from Fox-McCloud/another-del-pass 
Another del->qdel pass
 2015-10-09 18:05:00 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Fox-McCloud
5c512793b9 Removes the Rest of Pooled Objects 2015-10-08 14:18:40 -04:00
Fox-McCloud
1349a52b10 APC Cell GC Fix 2015-10-05 05:39:22 -04:00
Robertha89
36115ed8aa Disregard that 2015-09-30 21:23:43 +02:00
Robertha89
f07a82936f Magical SMES for consistancy 2015-09-30 21:22:43 +02:00
Robertha89
1a463b75f0 Reduce starting power 2015-09-30 21:21:10 +02:00
Robertha89
7184df0aac Fixes Name issue and gives engineering more power 
Very often now, this is how the round starts, power starts going out, engineers does nothing, nobody does anything, and there are so many rounds where the power runs out station wide, i.e it takes an hour to set up power, this will buff the starting power of engineering, so that power does not start running out during the first half hour of the shift.

Also, fixes the name back to SMES.

This can be considered a somewhat controversial pull.
 2015-09-30 01:06:25 +02:00