Commit Graph

41 Commits

Author SHA1 Message Date
ReddeyfishVor 768887d85a Virgo merge (#107)
* Move pilot helmets from southern_cross to main files, they are used on multiple maps now.

* Ports export reports (#5051)

* Ports export reports

* Absolute pathing, small touchups

* remove both layers

* POLARIS: No string compare for assistants

* Make turf obfuscation lists lazy

* Improve two image cleanups

* POLARIS: zshadows should be as invisible as their origin

* POLARIS: Allow alteration of mob default see_invisible

* say() safety check on client

Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.

* POLARIS: Reduce double admin logs

* POLARIS: Clean up adminpm logs

* POLARIS: Communicator small refactor

* POLARIS: UI Tweak involving species rarity

* POLARIS: Allow species-specific statpanels

* POLARIS: "0x32" is not a valid single-bit flag

* POLARIS: Lazylen species restricted list

* POLARIS: Prevent ghosts from ejecting borgs from rechargers

* POLARIS: Make borg recharger test more robust

* POLARIS: Another recharger fix

* Fix nif logs

* Removes some problematic HIDEJUMPSUIT flags

* Camera fix

* adds statue

* adds statue

* Revert "adds statue"

This reverts commit f1c9193797.

* POLARIS: Improve robot and typing overlays

* Change to Teshari to test for bug

Removing these, to see if they are related to the Teshari bug. These are the only two unique sprite features that I can see.

* Promethean tweaks (hunger, regen time)

* Xenoarch Multitool & Xenoarch Excavation Drill (#5058)

* Xenoarch Multitool & Xenoarch Excavation Drill

* Makes the tool work better

* Cuts down on lines & left comments

* change to m

* Ports antibiotics overhaul (#5050)

* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles

* Fixes the drone borg ID thing AGAIN. (#5080)

* Fixes the drone borg ID thing

* Updates tracking implant description

* Update tools_pickaxe_vr.dm

* Removes excavation drill

* Fixes default synth tails necessitating potentially harmful mystery delays in mannequin generation.
-Now get_tail_image() can check the owner's syntheticness without having to wait for something else to call it whenever/wherever the fuck it happens.

* Fixes missing pixel on human ass.

* Update update_icons_vr.dm

* absolute pathing

* added slashes. No idea for what, but I don't want anyone to ask me to do it because they have OCD

* Some size stuff for Proteans

* Removes a bunch of my unused fluff stuff

* fixed vale borg flashlight eye sprites

* Changes to objects random

- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools

* Removes an inconsistency in custom species code

This line had no real use at all. It may even have contributed to various issues.
All basic humanoid species have had their appearances constructed onto an existing blank 32x32 icon_state named and called for as "nothing" inside the effects.dmi.
There are no untitled blanks either inside the effects.dmi file, so the funky deviant custom species icon_states would never have had any proper fallback.

* Re-establishes existing foundations for human icon

This line had no real use at all that I could find. It may even have contributed to various issues.
Before this line was added, all basic humanoid species have had their appearances constructed onto an actually existing blank 32x32 icon_state named and called for as "nothing" inside the effects.dmi.
There are no untitled blanks either inside the effects.dmi file, so the funky deviant species specific icon_states would never have had any proper fallback either.

No negative effects whatsoever detected in testing runs. Maybe slight framerate increase, but that was likely unrelated/placebo lmao

* Couple security otie fixes

-Fixes sec oties failing to announce arrests for sec comms.
-Adds another announcement for sec oties to confirm successfully detained crimester.

* Fixes custom accessories not showing up on things

Contradictory hardcoding babe.

* Fixes inconsistencies in organ system
-Seems the years old conversion to turn old limb names and tags and such to BP constants was never finished.
-This also fixes warning spammy diona organ tags.

* Balance pass on custom species traits

* Revert "Fixes cameras making completely black photos"

* Fixes handheld cameras

* Resh - Navy HoS Jacket

https://forum.vore-station.net/viewtopic.php?f=27&t=1065 - approved fluff app. Long time coming, lol.

(And first time 'coding'/using github to change files. hope I did it right. Oof.)

* Increase prom limb health by 60%

* changes hairstyles to use species defines

* Correct Resh custom_items.txt for HoS jacket

* (SQ-Merge) Adds in Floppy Bunny ears. (#3348)

* (SQ-Merge) Possible fix for drop-nomming (#3331)

* possible drop-nomming fix

* no longer 100% fall cushion on non-aligning prefs

* fixed some checks

* (SQ-Merge) Makes rads not kill people in stomachs (#3342)

* Makes rads not kill people in stomachs

* There we go

* Update radiation.dm

* POLARIS: Fixes #3308 (VS) - Skrell lack eyes

* POLARIS: Fixes #3280 (VS) - Typing as ghost removes overlays

Also gives them the proper ghost speech bubble. Unsure why it wasn't used!

* POLARIS: Fixes #3298 (VS) - Observer-ghosts were naked instead of dressed

* POLARIS: Fixes #3270 (VS) - Cleanbots make noise too often, reduce chance

* POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed

* POLARIS: Fixes #3237 (VS) - Cryoconsoles are lit even when unpowered

* POLARIS: Fixes #3238 (VS) - Nothing but humans can understand silicons talking

* POLARIS: Fixes #3221 (VS) - No explanation of what to do in the case of system instability

* POLARIS: Fixes #2601 (VS) - Allows mechs to continue charging after battery swap w/o moving

* POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles

* POLARIS: Fixes #2573 (VS) - Slap cigarettes off people's faces

* POLARIS: Ventcrawling assistance

* POLARIS: Fix holders to avoid forcemoving held mob to nullspace

* POLARIS: Allow crawling through vertical pipes

* POLARIS: Weird snacks runtime

* POLARIS: Sometimes items have this set to null because they are bad.

* POLARIS: Beam weapons runtime when you shoot yourself

* POLARIS: Fix a call to the wrong update icons in prom regen

* POLARIS: Fix incorrect robolimb checks

* POLARIS: Heal robolimbs when you heal everything

Typically only used in magic and stuff, makes sense to heal both (otherwise there's no way to heal whole FBP bodies)

* POLARIS: Add eye color to shapeshifters

* POLARIS: Adds an animation thing, uses it on ventcrawls

* Fixes Suit Storage Icons
Items in suit storage should no longer vanish.

* Adds Keypad Auth to CE Office

* 44 revolvers

Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.

* Adds bioprinter to medical

Only internal organs work well

* Fixes feathered tesh tail and removes an useless piece of code.
-Feathered tesh tail now uses the proper dual color system now that it no longer comes with the default tail.
-Removes completely redundant body hair code from robolimb icon generation.

* byond beta back on its bullshit

* Update organ_icon.dm

* Update organ_icon.dm

* Probably maybe fixes blank lines for prey

* Fixes incorrect camera naming/networks. Fixes #3353

* Nanoui now supports use of multiple templates (#5105)

* Nanoui now supports use of multiple templates

* Removing debug code, indentation

* Indentation

* Arranges lots of things into planes (#5072)

* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic

* Lore-Compliant Oculum News Channel (#5111)

* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster

* new news channel containing lore-compliant news that's not bad

* prettified lorecodex, added a month's worth of news (#5112)

* prettified lorecodex : added a month's worth of news

* what the hell elgie

* all according to kaikoku

* Grant remote profile access to R_DEBUG holders

* Fix for MOB_CAN_SEE_PLANE

* Normal brute kits disinfect wounds

* Fixes fullbright mode hiding lighting overlays.

Fullbright plane master being above lighting plane master is important, shouldn't be removed.

* Fixes machines being below tables they should sit upon.

* Fixes Runtime in logging.dm,61

* Removes vials

* Update and rename pai_manifest.tmpl to crew_manifest.tmpl

* Change of template

* Fixes infinite loop in FBP naming w/o client

* Adds Map Template Groups
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.

* Adds a message on emag to the battle arcade machine. (#5129)

* Updates one arcade machine emag message to to_chat, adds another.

* Returns 1 in emag_act for orion trail.

* Converts a bunch of stuff to macros. Should probably not break anything.

* Fixes an improper macro usage.

* Attempts to fix all 20 errors.

* Makes syndie dufflebags hint that they let you move faster

* Fixes untagged sorting junction

* Actually adds adhoc_fallback to pilot headsets

* Map fixes and tweaks

- Flashers in brig cells now should work, extra floor flash in communal brig to deal with crims.
- Inproper access, SMES rooms.
- Trader start point being dark now fixed.
- Medical Vendor Plus has more advanced burn and trauma kits. Also splints.
- Cell 1 and 2 in the brig can now be accessed by detectives.
- Additional r-walls next to the engine room to help with rads.
- Floor decals in a couple areas.
- RD office now has its telescreen back.

* Fix unused variable warnings.

* Fix light/camera layers for macros and fix constants for them too.

* Updates changelog

* Camera types exist to determine networks!

* Reverted use of 'usr' back to 'user' from commit 05fd53ebcc

* Fixes a bug. It's flatland zorren. 

Fixes #3376

* Fixes wallet-HUD interaction issues. (#5130)

* Fixes wallet-HUD interaction issues.

* Fixes HUDs, too. Forgot to commit this the first time. Also hopefully didn't change the map to examplemap.

* Fixes an indentation error.

* Nerfs solargrub drain speed.

Due to the lack of saturation in the moderate event container, solargrubs show up way too frequently, and changing the frequency doesn't help. The container has to pick. This change will just bump the drain speed down so severely, that if you kill one or two grubs, the station should barely feel the impact anymore. As opposed to having to kill 4/5 grubs on average.

Gradual nerfs seem logical, as grubs get more and mroe of a day-to-day experience, and most people know about them now. Time to stop the witch hunting for those annoying grubs :p

* In which MC is dumb. Actually removes network override

* Initial cleanup/changes

* More optimizations for character joins

* Switch cables and pipes to use define constants instead of literals for layers.

Also fix a few things to be on the correct plane.  Basically the under-floor stuff is supposed to be on PLATING_PLANE.
Portable atmospherics go on object layer so they are above stationary machinery, given that they move around.
Fixed wires to be on top of pipes like they used to be, otherwise they'd be obscured too often.

* Don't kick admin observers for inactivity.  They might be waiting for ahelps.

* Fixes vox not having hardsuit sprites. Uses the new defines.

* Replaces base egun sprite

* Small fixes and ports discovered during merge. (#5138)

* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.

* Fixes a bunch of simple animal vore icon issues.

* Fixes Pathing

* Small Shock/Holo collar tweaks.
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.

* more fixes etc

* Update solargrub.dm

* Improves contrasts on sprites and removes the need for mirroring upstream sprites

* adds generic gibs to vore mob icons to prevent sneks

* Adds a bunch of stuff to cargo selection.
-Xenowear crate, 13 non-random xenowear items for 100 points.
-Teshari smocks crate, comes with all the 5 basic colors for 25 points.
-Teshari undercoats, comes with 4 random colors from basic and grey selection for 20 points.
-Teshari undercoats black, comes with 4 random colors from the black trim selection for 20 points.
-Teshari cloaks, comes with 4 random colors from basic and grey selection for 40 points.
-Teshari cloaks black, comes with 4 random colors from the black trim selection for 40 points.
-Utility uniforms, comes with the 3 loadout utility uniforms (black/blue/grey) for 30 points.
-Skirts crate, comes with the 10 regular type skirts for 40 points.
-Varsity jackets, comes with the set of 6 colors for 60 points.
-Leather gear crate, comes with 5 random items from a selection of 21 more or less tough/kinky gear for 50 points.
-Eyewear crate, comes with 11 cosmetic and/or prescription pieces for 50 points.
-Gloves crate, comes with 4 random gloves with a chance to hit a couple fancier ones among the basic colors for 40 points.
-Boots crate, comes with 3 random pairs of boots freely available in loadout for 60 points.
-Taurbags crate, comes with the 3 universal saddlebags we have (basic/robust/vest) for 60 points.
-Cuisine crate, comes with 5 random foods from a list of varying cultural fanciness for 25 points.
-Burger crate, comes with 5 random basic burgers for 15 points.
-Special burger crate, comes with 3 random special burgers for 60 points.
-Bakery products, comes with 5 random bakery products for 15 points.
-Cakes crate, comes with 5 random cakes for 50 points.
-Mexican food crate, comes with 5 random mexican foods for 15 points.
-Asian food crate, comes with 5 random asian foods for 15 points.
-Action figures crate, comes with 5 random figures for 50 points.
-Tabletop miniatures crate, delivers the set of those characters for 30 points.
-Plushies crate, comes with 3 random plushies for 30 points.

* Changes wedding rings to be a subtype of ring

Also moves them to their own .dm, since they're now a subtype of the thing in rings.dm. Also changed bethrothed to spouse, as the former is usually before marriage and not after.

Benefits of this include: Being able to wear gloves over wedding rings. Making them tiny instead of small. Making their gender neuter instead of plural, so it wont say "some wedding ring" when you examine someone wearing them. Probably more good things.

Issue reported by HzDonut.

* Cargo pack tweaks.

* Adds a machine for recoloring apparel ingame.
-Not mapped in currently.
-Still unsure whether to have it whitelisted for white/grey items only or to let people have their fun experimenting on nasty aesthetics.
-Also supports bags and belts. Yes, I've heard the pleas of the people not liking the default grey being the only public backpack option there is.

* Reverts gauze disinfecting until a proper solution can be put in place.

* Fixed mesons NIFSoft overlay not highlighting open spaces above

* Fixes #3368 - Teleporting now often respects dropnom pref

* Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe

* Squashed commit of the following:

commit f55edb98499b600186be9f58c0d245b454479b74
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 17:05:19 2018 +0300

    we'll see about that whitelist crap later then

commit 186ce2aba274c4009c42a730d1ba7c67dddf8ea6
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:32:08 2018 +0300

    screw you too travis

commit 470789300bda3949de4027dc8e2c25ae8427eaae
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:10:29 2018 +0300

    Update painter_vr.dm

commit e9dee86b0cb84172c95f3a91ba73ce0b2661820c
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 15:51:37 2018 +0300

    Update painter_vr.dm

* allows meteors to be deflected by baseball bats

* snib

* oh, and the DME, too

* fixes the meteor refusing to move at all after being deflected

* done

* Fix shuttle corner turfs disappearing when shuttle moves.

When shuttles land on a turf, it takes the appearance of the turf it lands on as an underlay.  Must make sure this underlay is on FLOAT_PLANE otherwise it will likely end up OVER the turf itself.

* Set appropriate vars for persisting adminspawned characters

* Minor Psych office tweaks. Closes 2090

* Adds compact defib to CC medbay. Closes #2287

* Makes the door button in EVA ACTUALLY WORK

* Squashed commit of the following:

commit bd470fd0276e83fa1516cc1b966308165d081b1b
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue Apr 10 20:45:00 2018 +0300

    Update painter_vr.dm

commit 12e39bcec9b717d477a64aca0f8dfe917917986b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 9 09:34:50 2018 +0300

    Update painter_vr.dm

* Reduce abduction chance 1%->0.5%, add logs

* Removes Camilla's plush as per request

* Some protean fixes (regen, size as blob, gender)

* switch map to tgm for merge

* convert map to tgm for merge
2018-04-11 17:14:22 -07:00
Neerti 12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
Neerti 62053ce63d Fixes check_rights() runtime. 2016-08-28 22:03:45 -04:00
SinTwo eabefc538a Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
2016-08-15 12:58:00 -04:00
SinTwo 6bb5409349 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade
Conflicts:
	code/modules/admin/holder2.dm
2016-08-15 12:26:53 -04:00
PsiOmegaDelta de6d2a4a31 Fixes check_rights runtiming for non-holders.
Fixes all kinds of errors.
2016-08-14 16:10:39 +01:00
NullSnapshot e987e2f0c4 allows check_rights to accept either mobs or clients. 2016-08-12 21:48:52 +01:00
SinTwo fe46fac5cc final new NanoUI fixes and tgui port 2016-07-27 23:01:26 -04:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega eca7569077 Clean server start.
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
2015-04-18 15:32:25 +02:00
Zuhayr 1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
ccomp5950 ebabf53c6d Staff now have a "re-admin self" button after de-admining themselves.
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
2015-03-05 11:05:58 -05:00
PsiOmega df689a4f72 Increased check_rights flexibility.
NanoUI interfaces no longer appear locked when admin observers look at them for too long.
2015-03-01 15:29:17 +01:00
Erthilo b6900d50fc Fixes admins not spawning as aliens on roundstart. 2013-08-20 14:20:33 +01:00
Cael_Aislinn aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-07 00:23:22 +10:00
Cael_Aislinn 31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 14:13:11 +10:00
Cael_Aislinn e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 01:07:36 +10:00
cib fd4a3576d4 Fix to the improved player notes list. 2012-12-09 21:00:36 +04:00
cib c56974f2e8 Fixes issue #2043
Player notes list now has a better organized interface, which should prevent BYOND overloading and dying a gruesome death.
2012-12-09 16:04:43 +01:00
elly1989@rocketmail.com 2e68af07c1 Merged listen_ooc, seeprayers, STFU_ghosts, STFU_radio, deadchat, sound_adminhelp, ghostears, ghostsight, canplaysound, midis, no_ambi and lobby_music into client.prefs.toggles as bitflags.
Toggling these preferences in-game will update your savefile. Meaning that your preferences will persist between rounds.

Added some savefile_version updating stuff. It's pretty crude. If you're changing any of the savefile stuff just ask and I can change it/help.

Removed some unused client vars

Ghosts no longer hear ambience. Simplified ambience code.

Simplified lobby music code. It will no longer cause a massive queue of events (which would eventually balloon in memory use)

Moved ooccolor and sound_adminhelp back to prefs. It's easier and allowed me to remove the setupclient() stuff completely.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5143 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-21 05:58:04 +00:00
elly1989@rocketmail.com 25b61bae72 Removed the infra_sensor define for noddie.
Integrated the sql and standard admin_rank stuff a little. Still needs some work.
Permissions Panel has a sexy floating search bar. The scripts and stylesheets are external files which will be sent to every client at connect, so they can be used in any panel you wish with no additional overheads.

If there are any bugs with the permissions panel (particularly the search bar) please let me know. thanks.

rights2text now has a seperator argument. It defaults to "", but can be any string, for instance "<br>"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5080 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-15 20:35:37 +00:00
elly1989@rocketmail.com 35cac8aefc Moved one or two bits out of +FUN and into a +SPAWN flag. The spawn flag allows mob transformations, spawning of items etc.
Moved fun (admin-event stuff) up to badmin rank.
deadchat visibility defaults to on
removed update_admin()
fixed associate so it won't accidentally add people to the admins list multiple times.
toggling ooc on/off is now available to any admin regardless of rights.
mass deletion is now restricted to DEBUG or SERVER flags
ADMIN, SERVER, DEBUG can all use the delete verb

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5032 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-09 21:58:10 +00:00
baloh.matevz c870d5e158 - Prayer visibility now starts on, as it should.
- Fixed pulse rifle, energy sword, blackhole and mob spawning
- Fixed 'reload admins' not properly updating the 'admins' list, which made adminwho fail, along with some other things.
- Fixed a bug, which prevented admin from even being loaded properly in some circumstances, in the database admin system.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5027 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-07 23:49:54 +00:00
elly1989@rocketmail.com 50fe648a91 Admin ranks now use bitfields for permissions. Rather than checking the name of the rank, adminverbs will now check holder.rights to see if it has certain bits turned on.
SERVER HOSTS:
This commit replaces the existing admin-rank system. It is now more customizable.
Admin.txt essentially works the same as it always has. Each line should look like:
ckey - admin rank

There is now however, an admin_ranks.txt. This textfile allows you to define ranks like so:
admin rank +ADMIN +FUN +BUILD
the +KEYWORD are flags adding permissions to that rank. There are brief descriptions in the text-file explaining what they do.

You can now name the ranks anything you like, and give them the permissions you want them to have. This allows, for instance, ranks like:
Game Admin on disciplinary +ADMIN +BAN
This would give that game admin only the tools they need to admin. They would not have access to 'fun' verbs which control events and antags.
There's lots of things you can do. For instance, a coder rank whom can debug stuff but cannot do admin tasks:
Codermin +DEBUG +VAREDIT +SERVER

There's lots you can do. As it evolves it will hopefully become more flexible.

admin_ranks.txt defaults to use the old admin rank names.

Apologies in advance as there will be a lot of anomalies, such as ranks losing verbs they once had. Please let me know about any problems. I can fix them quite easily simply by moving verbs between the lists or splitting the lists up into new flags.

CODERS:
There is now a check_rights(flags) proc. 
It check is usr is and admin and has -at least one of- the rights specified.
It checks > usr < not src, so keep that in mind!
If you need to check if something other than usr has specific tights, you can do if(holder.rights & R_ADMIN) etc.

KNOWN ISSUES:
+FUN probably needs to be split up into +MOBS and +EVENTS
In-game promotion/demotion is currently disabled. It will be readded after everything else works ok.
Erro's sql rights changes stuff is currently commented out. It will be re-added.
There are still many many verbs which need updating.

Apologies in advance for any inconvenience.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4991 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-02 10:23:04 +00:00
elly1989@rocketmail.com 4d9876fd65 Fixes issues with pen bbcode. Replacetext did not work correctly after I changed text2list - (It was missing 'needles' at the beginning of 'haystacks').
>dd_replacetext and dd_replacetext_case are now replacetext and replacetextEx respectively.
>replacetext and replacetextEx works using strings only; it doesn't convert it into a list and then back into a string.

Fixes some dumb-dumbs in textlist and text2listEx
> "<" where there should be a "<="
> no else case for when the separator is longer than the text (causing empty lists to be returned)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4971 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-27 21:21:17 +00:00
Cael_Aislinn b7bc344d6e fixed an issue where mods could gain access to admin powers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-25 20:31:00 +10:00
elly1989@rocketmail.com b1fdee2e32 Changed some global_list stuff:
>tried to make the comments less confusing.
>Removed the procs for rebuilding the lists (they weren't meant to be used and half were broken anyway).
>added a directory. It maps ckey to client like so directory[ckey] = client. It could be used for PMs, banning, and various other admin tools rather than using \ref[]
>var/list/admins is now a list of clients whom are admins.
>var/list/admin_datums is what var/list/admins used to be. A map from ckey -> admin datum
Most of this is so I can add modular admin ranks in a non-horrendous way and fix some existing issues.
>var/list/client_list is now var/list/clients (laziness sorry)
>removed some needless loops and stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4951 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 20:11:39 +00:00
elly1989@rocketmail.com 7b720a20b6 >Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever
>Replaced dd_text2list, dd_text2listcase, tg_text2listcase and tg_text2list with text2list and text2listEx. text2list will return a list of each and every character in the string if you set separator=""
>added return_file_text(filepath) which returns text from a file after doing some checks: does the file exist? is the file empty? It prints helpful error messages to the world.log if it runs into problems
>Replaced dd_file2list(filepath, seperator) with file2list(filepath, seperator). It just calls text2list(return_file_text(filepath), seperator). rather than copypasta
>Replaced time_stamp() so it's not as retarded
>Lots of the world setup stuff uses file2list now, rather than file2text -> sanity -> text2list
>Added error() warning() testing() procs. These print messages to world.log with a prefix. e.g. ## ERROR: msg.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 14:39:36 +00: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
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 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
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
cib 46f2864cd3 Ported BS12 player info system. 2012-10-13 08:34:45 -07: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
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
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 9813d2bbec var/fakekey; var/ooccolor; var/sound_adminhelp moved from /client to /datum/admins. These settings will now persist through a round even through logouts.
var/stealth merged into var/fakekey as it was superfluous.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4753 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-25 13:09:43 +00:00
elly1989@rocketmail.com f8da06db13 Re-added the default-vote config option for voting. For every client connected more than the total votes, it will add 1 to the default vote option (No restart or the current game-mode).
/obj/admins is now /datum/admins because that's what datums are for you silly people
Moved var/datum/marked_datum from /obj/ to /datum/admins
admin datums are persistent throughout the round. They are stored in the var/list/admins rather than the ranks. This is so admin preferences may be moved into the datum to have them persist even after Login/Logout/Disconnects.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4749 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-24 11:40:41 +00:00