cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 5 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

2167 Commits

Author SHA1 Message Date
Mij
9be730245a Mij's first attempt at a commit. Please lemme know if this doesn't work. 
Adds msay verb to admin observers and above, including admins and mods. Test successful on local build.
 2012-10-23 21:14:17 -07:00
giacomand@gmail.com
2fe846065a -Added "give disease" VV dropdown option. 
-You cannot spread diseases which are marked as SPECIAL or NON_CONTAGIOUS via blood injections.
-Carp no longer drift in space.
-Captain helmet now protects you from facehuggers.
-All humanoid aliens can now Regurgitate.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4946 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-24 00:29:27 +00:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 20:15:05 +10:00
Cael_Aislinn
ecb74a32d2 fix for admins not being applied properly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-22 19:57:50 +10:00
baloh.matevz
0f767e5cae - Added a small correction to the permissions panel code. It will now save ckey(s) where s is the key you insert for the new admin. This was an oversight on my part. Until the server is updated past this revision, just insert the ckey when prompted, same as you would into admins.txt. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4927 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-21 02:22:56 +00:00
Cael_Aislinn
01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:25:04 +10:00
Cael_Aislinn
2a07ba0f6e mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 01:04:37 +10:00
Cael_Aislinn
2f853fe23a Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:25:05 +10:00
Cael_Aislinn
3fe88c4fef mergefixes, misc 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-21 00:11:01 +10:00
cib
4046b80829 Corrupt heads should now be displayed in antagonist panel. 2012-10-19 10:59:01 -07:00
cib
ed6994d17c Removed the silly adminhelp delay. 2012-10-18 16:33:14 +02:00
aranclanos@hotmail.com
ce94195578 Nerfed admin observers to the ground. Instead of listing what they can't do, I'l just list what they can do. 
-Acces to asay chat, chatting included (asay comes with adminlogs alerts)
-Toggle adminhelp sound
-Deadmin themselves
-Answering adminhelps (They shouldn't be doing this acting like real admins)
-They can see prayers

Everything else is gone, VV, PP, subtle message, etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4903 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 13:17:34 +00:00
aranclanos@hotmail.com
d21fb3c87c Quick fix for trialmins being able to right click -> VV 
Removing VV from observers. (More nerfs incomings)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4899 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 09:36:42 +00:00
johnsonmt88@gmail.com
05f2c58d9b Admin observers: 
- No longer see antagonists via /who command.
- Now have the 'toggle adminhelp sound' verb.

Removed a bunch of the 'deadmin_self' verb from various admins and gave it to admin observers. All admins should have it now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4895 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-17 01:13:26 +00:00
aranclanos@hotmail.com
ac5259836f My first commit, yay! 
Removing:
 -Erro code of r4861. Xsi gave me permission p-please don't kill me.
Proc added:
 -Added a proc that checks the rank of the admin and compares it to a var given. If the check fails, returns a 0 and a "You need more acces" message. If not, returns an 1. admin_rank_check(var/rank, var/requested)
Admin option changes:
 -You need to be at least a trialmin to change a var in VV.
 -You need to be at least a trialmin to change the vars on the tator panel
 -You need to be at least a trialmin to allow votes or start a custom one. (All admins can cancel votes)
 -All mob transformations (of playerpanel and VV) and special options (like godmode), now requires trialmin status or higher.
 -All admins can use aghost now.
 -All admins can right click - VV if they are a ghosting.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4889 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-16 03:07:08 +00:00
petethegoat@gmail.com
5b1e7cb336 Removed the bandolier, on account of it looking like shit. In the two places where it was used, it's been replaced with the normal satchel. 
Added the safe! A majestic two tumbler chunk of metal.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4882 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-15 15:01:16 +00:00
Cael_Aislinn
548f60d25d Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-15 23:17:18 +10:00
baloh.matevz
266f163879 - To support the SQL based admin rank system, I added a permission assignment panel, which is accessible to the people who have the PERMISSIONS permission. This panel can be used to add new admins, remove or edit the rank of existing admins. 
Screenshot:
http://www.kamletos.si/permissions%20panel.PNG

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4878 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-14 19:45:21 +00:00
Cael_Aislinn
d5a4a268d7 moved mod panel to a new file, removed the admin stuff from it 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 14:31:45 +10:00
giacomand@gmail.com
940808ee86 -New facehugger animation by Sly. 
-Moved "debug_controller" to badmin, so if the controller needs debugging a game admin can promote a coder to badmin and allow them to debug it.
-Fixed an issue with aliens having two different status tabs.
-Moved all facehugger icons to icons/mob/alien.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4862 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 21:26:30 +00:00
cib
415e1c47d9 Made nudge.py script location configurable. 2012-10-13 11:11:57 -07:00
cib
46f2864cd3 Ported BS12 player info system. 2012-10-13 08:34:45 -07:00
Travis Whitehead
524265b872 Fixed Moderator text color in OOC + Mods no longer see admin logs 2012-10-13 03:39:33 -07:00
johnsonmt88@gmail.com
a65f8c3ff8 Admin Observers have lost two verbs: 'gibself' and 'investigate' by request. 
Telebacon has been commented out. Fixes(haha) issue 999.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4851 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-13 03:10:34 +00:00
Mloc
046348db49 Merge pull request #1744 from CIB/branch 
Several changes to organs + bugfix
 2012-10-12 12:15:57 -07:00
cib
0aa3bde885 Fixed the problem where you don't get the game-panel verb. 2012-10-12 11:41:01 -07:00
Cael_Aislinn
d59dc63fed re-add asay >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 01:37:08 +10:00
Cael_Aislinn
a0c91e200d re-added missing admin verbs (bans, toggle ooc, msay etc) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 00:51:30 +10:00
Cael_Aislinn
3e11992cce re-added game panel for admins and added zas options, extended postgame restart delay from 25 seconds to 60 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-13 00:01:45 +10:00
Cael_Aislinn
6fc9aab4f6 some merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 18:21:50 +10:00
Cael_Aislinn
419247adfe Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 17:53:17 +10:00
Cael_Aislinn
39f528e0ce re-enabled custom event verb 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 16:49:59 +10:00
Cael_Aislinn
79ad144e91 fix^2 for mods and admins not being applied correctly, along with the admin/player panel not showing up 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 16:39:26 +10:00
Cael_Aislinn
fed6625e07 fix for moderators not being loaded correctly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 13:44:23 +10:00
giacomand@gmail.com
5eba2eda1d -Added a new Game Master fun button. It will set the default player OOC colour to whatever the user chooses. 
http://i.imgur.com/xRM7j.png

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4845 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-11 22:24:08 +00:00
Cael_Aislinn
f22948967f tweaks to game start / admins, fixe for adjacent reaching not working 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-10 00:41:50 +10:00
Cael_Aislinn
cccff0881f Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport 
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-09 23:07:41 +10:00
Cael_Aislinn
825a7dcbf9 various mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-09 22:49:38 +10:00
giacomand@gmail.com
7d6fb8fd6a Commiting for Aranclanos. 
http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=10189&p=143580&hilit=https%3A%2F%2Fwww.dropbox.com%2Fs%2Fcwflgm7793ts20s%2FBorgsForCasualsRELOADED.patch#p143580

-Fixed some ugly text in Ion laws "THE STATION IS [0x6006265] FETISHES...LAWS UPDATED".
-Fixed some typos on the Ion laws.
-When borgs are emagged, now they show their laws for themselves.
-When new laws are uploaded, the borg gets instantly the new laws, just like the AI, instead of the confusing message "Your AI has set your 'laws waiting' flag.". Remember this is a patch for casuals.
-The borgs gets the same message than the AI in Ion storms.
-Made the admin Ion storm show the "...LAWS UPDATED" text.
-Borgs get a different law 0 telling them to help their master.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4837 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-09 05:37:28 +00:00
Cael_Aislinn
6bd0e536bd Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm
 2012-10-05 22:21:26 +10:00
sieve32@gmail.com
e3d239108a Forgot a file with my last commit 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4809 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-04 22:39:54 +00:00
baloh.matevz
148b6e5c19 - Moved TAGGERLOCATIONS to setup.dm for easier access and lookup. 
- Added an areatest verb to debug verbs. This tests areas for whether they have APCs, air alarms, etc.
- Added an 'autoname' subtype of obj/machinery/camera. Cameras of this type auto-assign their c_tag, based on which area they're in, followed by a number. For example "Male Dorm #1", "Male Dorm #2", etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4806 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-10-04 21:01:42 +00:00
elly1989@rocketmail.com
01882fec26 Resolves issue 961 - invisibility is set in the define not in New for ghosts 
Replaces usr with mob. Using usr means invisimin can't be used as a proc


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4765 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-28 03:56:51 +00:00
Cael_Aislinn
0fbf610ffb more merge fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 20:31:13 +10:00
Cael_Aislinn
640ce4fd5c WIP mergefixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 20:10:58 +10:00
Cael_Aislinn
b618eeef82 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport 
Conflicts:
	code/controllers/configuration.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/factions.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/verbs/ooc.dm
	code/game/verbs/who.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/login.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/paperwork/paper.dm
	config/config.txt
	html/changelog.html
	icons/mob/human.dmi
	icons/mob/human_face.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-09-26 18:49:18 +10:00
elly1989@rocketmail.com
cc2c4de49b Merged var/muted_ic; var/muted_ooc; var/muted_deadchat; var/muted_pray; var/muted_adminhelp into var/muted as bitflags 
Added a config option config.automute_on It toggles automuting.
Admins cannot be muted.
Made the proc/cmd_admin_mute code shorter.
Automuting defaults to off

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4758 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-25 21:23:02 +00:00
elly1989@rocketmail.com
42d138d0a0 Deleting more obsolete code. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4756 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-25 14:22:18 +00:00
elly1989@rocketmail.com
349317a9bf Removes client/var/team. It was unused. 
Tidies up a few loose ends with the obj/admins -> datum/admins changes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4755 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-25 14:14:13 +00:00
elly1989@rocketmail.com
1942f3710e Deleting the old admin holder stuff 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4754 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-09-25 13:15:37 +00:00