Commit Graph

806 Commits

Author SHA1 Message Date
Daniel 30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
Daniel 6c668c7c7b Generalised PDA naming 2014-04-09 18:43:29 +02:00
Miauw 5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
Giacomand c67334c929 Added a configuration option that disables OOC during the round automatically. Defaults to allowing OOC during the round. 2014-04-05 19:41:47 +01:00
Miauw62 823c59502f Merge pull request #3234 from Rockdtben/fixAdminDB
hue
2014-04-01 14:21:34 +02:00
fleure db1ac17930 Merge pull request #3214 from Niknakflak/Lasertagequipment
Adds Laser Tag Equipment set to admin verb: "Select Equipment"
2014-03-31 19:27:21 +01:00
MrPerson e2defa667a Upgrades to the play admin midi client pref
Toggling it off will pause any songs currently playing. Toggling it back on will resume playback from where you were.
Toggling midis on will play the currently playing admin midi, if there is one.
2014-03-31 05:41:33 -07:00
Miauw dc9ead6575 Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
	code/game/sound.dm
2014-03-30 20:48:03 +02:00
Rockdtben 117b51be0e Added a better error message 2014-03-29 16:58:55 -05:00
Rockdtben 3d0d5b4fb2 Fixed some issues with the DB admin system
-erro_admin_ranks table did not exist
-passing a string in to admin new instead of a rank.
2014-03-29 16:56:42 -05:00
Razharas 24491ad36b Merge pull request #3188 from Rockdtben/NewscasterCommandReports
Newscasters will now show Central Command Updates.
2014-03-29 06:20:10 -07:00
Niknakflak 6a6b968fbd Adds Red Laser Tag equipment set and Blue laser tag equipment set to the "Select Equipment" Admin verb 2014-03-27 17:35:55 -07:00
Rockdtben 1de30e3d22 Made the admin command Access Netscastor Network use the news_network procs. 2014-03-26 08:23:39 -05:00
Giacomand c0d6e47e7e Merge branch 'master' of https://github.com/tgstation/-tg-station into SQDL2
Conflicts:
	tgstation.dme
2014-03-26 08:00:20 +00:00
Aranclanos 34757f900e Merge pull request #3161 from Giacom/gravity_changes
You will fall over in zero gravity, again, but you won't make a noise.
2014-03-26 03:27:20 -03:00
Giacomand 3811c9af05 Added world.log and log_game() to the SQDL logging. 2014-03-25 10:27:03 +00:00
Giacomand 65602cb72d Added admin logging for the gravity generator. 2014-03-25 10:12:33 +00:00
Mloc-Hibernia 8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
Giacomand 3d509f84e3 Added examples.
Removed a now unnecessary workaround.
2014-03-23 23:07:52 +00:00
Giacomand c6239b9257 Merge branch 'master' of https://github.com/tgstation/-tg-station into SQDL2 2014-03-23 22:28:29 +00:00
Miauw a80dd4df0f Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
2014-03-22 17:42:07 +01:00
MrPerson 6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Cheridan e8a69f7d37 Merge pull request #3072 from Aranclanos/MaintDoors
Maint doors toggles fixes.
2014-03-17 22:40:54 -05:00
Razharas 78a6a1c416 Merge pull request #3068 from Aranclanos/Profiles
Profiles from client.
2014-03-16 12:52:56 -07:00
Aranclanos 6dffc8a72f The admin functions and comms console options to switch the level of access of the maint doors will now work properly and not runtime. 2014-03-14 01:57:42 -03:00
Aranclanos 7b767c7c94 Added a new admin txt under the new cfg folder. The ckeys of this list will be able to make profiles on servers that they are admins. We welcome servers to change this list as it is a configuration file. Being on this list does NOT grant you any kind of admin powers.
All admins will now have the control_freak disabled but for skin and macros, to make this work.
2014-03-13 15:38:06 -03:00
Rockdtben a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
Cheridan a7b7bd0bf2 Merge pull request #3023 from Jordie0608/allthebuttons
Reload admins usable by anyone with adminrank
2014-03-09 14:10:17 -05:00
Miauw 520b114293 fixes shit 2014-03-09 18:31:43 +01:00
MrPerson 6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Jordie0608 1fc448c043 Reload admins usable by anyone with adminrank 2014-03-08 15:46:36 +11:00
drynwyn abefc24a87 Switch gangster ammo to match weapon
Fixes #2988
2014-03-07 09:54:59 -05:00
Cheridan d4c81ce247 Merge pull request #2936 from MrPerson/jitterbug_dizzydummies
Redo of jitteriness and dizziness.
2014-03-03 11:35:27 -06:00
MrPerson 3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
MrPerson 917a2dd2a4 Rename equip_to_slot_or_qdel() -> del()
Still qdel()'s them, just naming the proc back.
Should hopefully reduce the number of lines different in the pr.
2014-03-02 21:08:25 -08:00
YotaXP cb7052f81c Removed group_multiplier nonsense from gas_mixture.
Moved gas_mixture.dm to the datums directory.
Deleted FEA.
2014-02-28 18:12:33 -05:00
MrPerson 48923f9ce5 Redo of jitteriness and dizziness.
Fixes #2923
2014-02-27 23:19:44 -08:00
MrPerson f0fd0c9949 Fixed the nuke disk qdel() fucking up
Made the singulo spawn correctly
Really minor fix for things that are qdel()'d at 0 time, which should be nothing if everything is going right.
2014-02-25 02:29:49 -08:00
MrPerson 9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
Perakp 965e7ad6d8 Merge to master
Conflicts in mob.dm
2014-02-18 23:59:59 +02:00
Perakp 1004235a28 Added feedback when you give spells to mindless mobs. 2014-02-14 21:47:41 +02:00
Perakp 7e324bb17c - Still fixing merge conflicts
- Giving spells to mobs without minds should work
2014-02-14 21:32:16 +02:00
Perakp 7ca06565b5 Merge remote-tracking branch 'upstream/master' into spellsFromBodyToMind
Conflicts (Resolved):
	code/datums/spells/mind_transfer.dm
	code/game/gamemodes/wizard/artefact.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/projectile/change.dm
2014-02-14 20:57:11 +02:00
Miauw 9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Miauw 8c7ef19be6 Replaced before_take_item() and drop_from_inventory() with u_equip 2014-02-12 19:51:37 +01:00
MrPerson c8144bc5c6 Nano UI for SMES
Screenshot:
http://imgur.com/63D3f8b
Buttons are greyed because there's no input available.
2014-02-05 16:32:07 -08:00
fleure a854a41994 Merge pull request #2540 from Incoming5643/blobjob
BE_BLOB and easy adminblobing
2014-02-03 10:34:31 -08:00
hornygranny c569654ebc Mobster items + shirt 2014-01-31 15:50:09 -08:00
Malkevin 302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/game/objects/items/toys.dm
2014-01-30 19:14:43 +00:00
Incoming 2320db2353 Remove Colons From Premises 2014-01-30 10:50:32 -05:00