cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 26 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

33 Commits

Author SHA1 Message Date
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
Jeremy Liberman
b3d3f5df8c Mutiny fix prereqs for directives 
Conflicts:
	code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
	code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
	code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
	code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
	code/game/gamemodes/mutiny/directives/terminations_directive.dm
	code/game/gamemodes/mutiny/directives/test_directive.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-05-25 22:34:39 +02:00
ZomgPonies
eed61ed46c Remove debug line 2014-05-24 16:51:50 -04:00
mwerezak
62daf11857 Possible fix for mutiny modes not being selected 
Not entirely sure, I've had trouble with the in operator precedence with
for-loops in the past. I can't test without seven people though.
 2014-05-24 22:08:46 +02:00
mwerezak
448d3697b6 Fixes bluespace contagion directive selecting... 
ghosts and new players as infected.
 2014-05-24 22:08:27 +02:00
alex-gh
d14d253414 Mutiny fixes? 3 
Attempt to fix mutiny by replacing .Add() and .Remove() with += and -=
 2014-05-21 16:30:49 +02:00
ZomgPonies
9e89c8cdcb Mutiny fixes 
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
	code/game/objects/items.dm
 2014-05-20 13:06:59 +02:00
alex-gh
5066000778 Replayed mutiny fixes 2014-05-20 13:01:15 +02:00
alex-gh
4dc1e5c0b3 Merged latest mutiny fixes. 2014-05-19 19:54:42 +02:00
ZomgPonies
a2b05d96f5 Mutiny fixes 2014-05-15 03:16:48 -04:00
ZomgPonies
8aa4d10b75 Trying to fix mutiny mode? 2014-05-15 01:52:27 -04:00
Jeremy Liberman
bd249e3a53 Mutiny Mode 
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
 2014-05-15 01:01:54 -04:00