Commit Graph

460 Commits

Author SHA1 Message Date
paprka
d41a469ff4 Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
Conflicts:
	code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
paprka
d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures.
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
paprka
b35cee5334 Removes extra periods from ban reasons 2014-07-17 17:51:20 -07:00
ikarrus
d3ec4dbf72 Resolving Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-06-27 09:30:43 -06:00
Cheridan
02603f89e4 Merge pull request #3934 from Ikarrus/jobequip
The Select-Equipment admin verb now includes all jobs
2014-06-21 00:47:30 -05:00
ikarrus
7f1bea18e5 Securitron Update
-Added a new access type that will act as a weapon permit that the HoS/HoP can manage. Centcom, Security, Captain, HoP, and the Barman start with it.
-Securitrons will now have the option to declare arrests they make to anyone who is wearing a security HUD. This can be turned off per-securitron
-Securitrons now have the option to arrest humans without any IDs. Defaults to off.
-Changed how securitron threat assessment is calculated
-Removed detective access from securitrons
-Stunning and cuffing now properly bolds their text for the perp
-Pingsky has its own type now

I realise there is a lot of existing duplicate code between the EDs and the securitrons, but I don't think I'd have the capability to tackle that any time soon.
2014-06-15 16:19:32 -06:00
ikarrus
726b1dc28f The Select-Equipment admin verb now includes all jobs
Useful for admins and coders alike.
2014-06-14 22:05:15 -06:00
MrPerson
44638fd05c Add logging to failed GC's that result in a del() call
You can view these logs in-game using a debug verb. You have to use the debug-verbs command to see it.

Removed the dellogging compile option. If this is a problem, speak up, but for most users, this new functionality is more useful.
2014-06-13 11:46:17 -07:00
phil235
23746fc228 under/det into under/rank/det 2014-05-31 00:36:26 +02:00
Alex
9066cccf9c Merge pull request #3645 from Ikarrus/announcements
Priority Announcement Changes
2014-05-18 02:07:55 +01:00
ikarrus
56d5412e50 Merge branch 'master' of https://github.com/tgstation/-tg-station into announcements 2014-05-14 08:34:49 -06:00
Rolan7
ab1dd6fc0d Medal of Captaincy is no longer twice as large.
Fixes issue #2883 and a minor bug where set-equipment wasn't properly equipping "assassins" with waistcoats.  Both cases now use the existing attachTie method, which exists for this reason.
2014-05-14 02:14:28 -04:00
ikarrus
a48ba0d256 Priority Announcement Changes
-Centcom announcement proc merged with generic priority announcement proc
-Re-added the Captain Announces accompanied by a new pleasant sound, instead of the generic priority announcement
-Captain Announcements will automatically generate a newscaster article
-Priority announcements without any defined accompanying sound will play a generic "Attention" soundbyte as an audio cue
-Communications consoles will display who is currently logged in
2014-05-05 22:18:57 -06:00
Aranclanos
b544a945a9 Fixes issue #2489
Fixes issue #119

Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
ikarrus
c7041eefce New Human Mobs will have the appearance of the client's preferences
New human mobs created via Admin Simple Transform, Admin Spawn Antagonist, and Wizard Apprentice functions will take on the appearance of the players' preferences, instead of the boring default Bald, White Male.

Also fixes an minor issue with using transfer_to() a new observer mob.
2014-04-27 14:40:28 -06:00
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
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
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
Giacomand
3811c9af05 Added world.log and log_game() to the SQDL logging. 2014-03-25 10:27:03 +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
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
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
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
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
Incoming
5c5cc6a72d Repurposes the outdated BE_MONKEY into BE_BLOB and seperates the alien and blob pools so people can prefer to be one or the other or both or neither. An annoucement should be made when this goes live so people are aware they have a new flag to set.
Adds a dedicated button on the player panel so admins can easily turn specific players into blobs.
2014-01-29 10:54:00 -05:00
Jordie0608
45ee53517a Outright removed toggle admin jump,spawn and revive buttons 2014-01-27 16:10:19 +11:00
Malkevin
a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/modules/mob/mob.dm
2014-01-26 19:22:33 +00:00
Pete Goodfellow
e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
Pete Goodfellow
5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
Giacomand
b9011097a4 Added support for calling procs via SQDL.
Moved the verb category to "Debug".
Added the verb to the "Debug verbs" button.
2014-01-18 18:59:02 +00:00