cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 15:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

61 Commits

Author SHA1 Message Date
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Krausus
eecf8ba93b to_chat fixes 
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
 2016-06-24 18:36:50 -04:00
Fox-McCloud
25477b0bbf clean up 2016-05-29 22:05:20 -04:00
Fox-McCloud
4f5b4f4677 cleanup 2016-05-02 00:43:24 -04:00
Fox-McCloud
ba154028c8 Game Mode Population Adjustments 2016-05-01 21:29:19 -04:00
Tastyfish
5268804db0 Fixes Check Antagonists Panel 2016-04-28 22:23:42 -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
7c3667ecb8 Adds PDA chatroom 2016-03-18 16:45:12 -04:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Tastyfish
492ed2f16e Corrects CentComm spelling 2016-02-22 04:39:10 -05:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Tastyfish
a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Crazylemon
23e8b1277f Wave 2 of tweaks, probably needs a little more 
Ripped out the preferences_savefile.dm because it's obsolete and we
don't use it
 2015-12-27 06:32:25 -08:00
Aurorablade
027d9660de IT COMPILES 2015-12-24 20:26:46 -05:00
Aurorablade
046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Fox-McCloud
c3440b07be Supply Controller Refactor 2015-10-14 05:11:02 -04:00
Markolie
b24f5ff979 Fixes and pinpointer update 2015-10-05 00:26:43 +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
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus 
Admin teleport update, further admin message fixes
 2015-08-18 20:19:55 -04:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Markolie
766b0c979f Turn dionas into simple animals 2015-08-17 02:19:29 +02:00
Krausus
bc41922cbc Fixes bad PDA tnote entries and minor PDA bugs 2015-08-14 23:33:38 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
ZomgPonies
fa5e97deb5 Missing dmis, final fixes 2015-05-25 20:35:35 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
DZD
4bcdb94a99 Merge with upstream/master 
Fixes conflicts
 2015-02-18 13:41:32 -05:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags 
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
 2015-02-10 17:41:37 -05:00
Markolie
c4f11b6693 Extra jobban checks 2015-02-01 16:38:17 +01:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
Markolie
b66f3effae Bug fixes, implements new copying/faxing system from Bay 2014-11-27 21:00:58 +01:00
Jeremy Liberman
a4196cb745 Add Vox Heist directive and call shuttle on completion of Directive X 
Conflicts:
	baystation12.dme
	code/controllers/emergency_shuttle_controller.dm
	code/modules/mob/mob.dm
 2014-08-06 23:12:24 +02:00
PsiOmega
ea378b3bb5 Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
 2014-07-28 13:24:38 -04:00
Zuhayr
0266582acb Missed a linebreak. 2014-07-13 06:22:39 -04:00
Zuhayr
197fc0c36c Cleans up some of the lore issues with Mutiny. 
Conflicts:
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
 2014-07-13 06:22:30 -04:00
Zuhayr
1b1961b4fd Changed Mutiny messages to use the existing Centcomm message format. 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
 2014-07-13 06:21:10 -04:00
ZomgPonies
cb9b6fca4d Replacing civilian with support department. Still need to make changes on MySQL schema. 2014-06-26 19:42:14 -04:00
alex-gh
6b230d693f Runtime fixes 2014-06-25 21:20:54 +02:00
mwerezak
e9171a9ae3 Adds docking support to shuttles, NanoUI 
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
 2014-06-14 04:10:39 -04:00
Jeremy Liberman
b9f40d1b71 Rephrase text based on code review 2014-06-05 16:05:25 -04:00
Jeremy Liberman
33cd27e032 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 
Conflicts:
	code/__HELPERS/names.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-06-05 16:05:09 -04:00
Jeremy Liberman
7a51eb9f6c Secret Mutiny Mode backstory easter egg 2014-05-28 00:45:59 +02:00