cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 26 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

196 Commits

Author SHA1 Message Date
Aurorablade
113f2770e3 somethingsomethingcaffine 2017-01-06 06:33:12 -05:00
Aurorablade
7fb084d690 tries to address comments... 
and will get them wrong.
 2017-01-05 22:07:21 -05:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Aurorablade
2c104adaf3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-01 00:43:50 -04:00
TheDZD
f5577b4a8f add_logs() un-fuckery 2016-08-29 17:27:56 -04:00
Aurorablade
47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
chopchop1614
346dd3cd70 Update horsemask.dm 2016-08-06 11:32:54 +01:00
chopchop1614
5ea4d4ab2f Update horsemask.dm 2016-08-06 11:32:26 +01:00
chopchop1614
2f5f28cc36 fixes the fix 2016-08-02 19:17:22 +01:00
chopchop1614
7f2f40d0bd Fixes horsemask 2016-08-02 19:00:04 +01:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Aurorablade
bb840f4dce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-07-21 23:56:34 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud
1ac09a962c Cleans up Vars 2016-07-21 01:43:16 -04:00
Fox-McCloud
a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
Fox-McCloud
943eb9b6dc grammar 2016-07-11 02:19:24 -04:00
Fox-McCloud
762ed61881 Adds in Rathen's Secret 2016-07-10 20:04:17 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets 
The Honkening
 2016-07-09 18:29:11 -04:00
TheDZD
a144980bde Minor tweaks 2016-07-09 11:37:26 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD
9cfb3dc644 Overeating is bad for you 2016-07-07 21:58:34 -04:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
Fox-McCloud
c6117cfa5a Wizard Mutate Spell Fix 2016-06-25 02:46:17 -04:00
Aurorablade
a02a38b6e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-21 07:42:29 -04:00
TheDZD
8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
Aurorablade
ef5b2d7c8e more things 2016-05-25 02:32:26 -04:00
Aurorablade
d102a0b0b9 more VG stuff 2016-05-17 21:09:45 -04: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
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
Aurorablade
a34efa3af8 fixes demons 2016-03-29 20:51:16 -04:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Aurorablade
848a590930 daemon 2016-03-11 01:48:09 -05:00
Aurorablade
70c510280a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DemonicUpdate 2016-03-10 20:19:08 -05:00
Aurorablade
7218478c9e tigerrawr 2016-03-10 19:46:17 -05:00
Aurorablade
6918e79943 Rawr 2016-03-07 19:53:14 -05:00
Tastyfish
422a2e6ed4 Fixes lich spell preventing round end when viewed in the spellbook 2016-03-06 21:59:48 -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
Fox-McCloud
e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Tigercat2000
0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Aurorablade
400ed30455 issue with identity transfer 2016-02-13 15:20:21 -05:00
Aurorablade
9a55bb11b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-13 06:37:49 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Fox-McCloud
5f2b5f1fde Updates Fake Disintegrate and Spell Icons 2016-02-10 00:01:37 -05:00
Fox-McCloud
a64e95104e Removes Mindswap Suiciding 2016-02-05 22:30:43 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Tastyfish
ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
Fox-McCloud
887ce1f37e fixes blind spell 2016-01-29 21:31:16 -05:00